replace BLOCKHASH test case in stBadOpcode

123 files changed, 5179 insertions, 5179 deletions

diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0.json
index cdbe6f615..3046bf6d2 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -13,27 +13,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xd220",
-                    "hash" : "0xbcfb18d09c6c8149e36cc91a6e38ff04ebe0084464e5f32179bb55110652964e",
-                    "mixHash" : "0xe22745c5d1e34537502cd34393bf7a2f933eb47d56597d5a679abc9bbc1a7fef",
-                    "nonce" : "0xf839377e9efa7c64",
+                    "gasUsed" : "0xd20e",
+                    "hash" : "0x4f60c0ce82cd4ec48a9cd0cfb5ee8495e6ce8a5a56d8714f953b2ba113745556",
+                    "mixHash" : "0x088109b761fbd70a806ac85c31ee17bb31d11f2c4058ee02cf8f0d30ff630dc1",
+                    "nonce" : "0x9548c89aeb7ea9e3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xd6512dba13f4f788cf4ffa260741d3db5603a263c2ff824fd7d96266e5cab31d",
-                    "stateRoot" : "0x5273712705ede48b9e7e680a293ded03728451dcb3c068832f038c12a3c10304",
+                    "receiptTrie" : "0x4c3bdae5e8af991d7efe784eb3d286c3fc32682050de03f650c6df5ed183507e",
+                    "stateRoot" : "0xbc324fc5bda0127343316c7b87ba57663016796135b019e9dc4d2e68abeb58b1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05273712705ede48b9e7e680a293ded03728451dcb3c068832f038c12a3c10304a0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a0d6512dba13f4f788cf4ffa260741d3db5603a263c2ff824fd7d96266e5cab31db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d2208203e880a0e22745c5d1e34537502cd34393bf7a2f933eb47d56597d5a679abc9bbc1a7fef88f839377e9efa7c64f85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc324fc5bda0127343316c7b87ba57663016796135b019e9dc4d2e68abeb58b1a0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a04c3bdae5e8af991d7efe784eb3d286c3fc32682050de03f650c6df5ed183507eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d20e8203e880a0088109b761fbd70a806ac85c31ee17bb31d11f2c4058ee02cf8f0d30ff630dc1889548c89aeb7ea9e3f85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -62,11 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcfb18d09c6c8149e36cc91a6e38ff04ebe0084464e5f32179bb55110652964e",
+        "lastblockhash" : "0x4f60c0ce82cd4ec48a9cd0cfb5ee8495e6ce8a5a56d8714f953b2ba113745556",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cd220",
+                "balance" : "0x29a2241af62cd20e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -80,7 +80,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a740",
+                "balance" : "0x0de0b6b3a761a752",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -100,8 +100,8 @@
     "badOpcodes_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -111,27 +111,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xd52c",
-                    "hash" : "0xbed2195cafb5c9b922d11f4f8cf63883f03fafc2ece9ae84f97c7747d1317365",
-                    "mixHash" : "0xa4908dee829228705e46a033adce98dee5038644ecec4c547cf92b79eb12c73f",
-                    "nonce" : "0x1f5519a9eb83fabd",
+                    "gasUsed" : "0xd20e",
+                    "hash" : "0xcbe40b6dd6075a02e803acdccd6b0d862c7e21dd77fd7b2381f2b83c294661ef",
+                    "mixHash" : "0x032052b2c23e88a408e1d3cd6488f8df671728a35c99d7532ba1337978799f9e",
+                    "nonce" : "0xf28940381b0dc093",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xca11e9ccea8aa3e26f67b448751f9270feae2fb59863e71df976323d17b5cd72",
-                    "stateRoot" : "0x5017e62c35522ede8f40e7df2541ff3449b9411d63eb16f4d24a648714b294cf",
+                    "receiptTrie" : "0x4c3bdae5e8af991d7efe784eb3d286c3fc32682050de03f650c6df5ed183507e",
+                    "stateRoot" : "0x5eafd9fd7f078cf61d78f9fe158700becf634eaa6fda190da282a5f0cb68aeef",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05017e62c35522ede8f40e7df2541ff3449b9411d63eb16f4d24a648714b294cfa0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a0ca11e9ccea8aa3e26f67b448751f9270feae2fb59863e71df976323d17b5cd72b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d52c8203e880a0a4908dee829228705e46a033adce98dee5038644ecec4c547cf92b79eb12c73f881f5519a9eb83fabdf85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eafd9fd7f078cf61d78f9fe158700becf634eaa6fda190da282a5f0cb68aeefa0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a04c3bdae5e8af991d7efe784eb3d286c3fc32682050de03f650c6df5ed183507eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d20e8203e880a0032052b2c23e88a408e1d3cd6488f8df671728a35c99d7532ba1337978799f9e88f28940381b0dc093f85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -160,7 +160,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbed2195cafb5c9b922d11f4f8cf63883f03fafc2ece9ae84f97c7747d1317365",
+        "lastblockhash" : "0xcbe40b6dd6075a02e803acdccd6b0d862c7e21dd77fd7b2381f2b83c294661ef",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -171,7 +171,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62cd52c",
+                "balance" : "0x29a2241af62cd20e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -185,7 +185,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a434",
+                "balance" : "0x0de0b6b3a761a752",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -205,8 +205,8 @@
     "badOpcodes_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -216,27 +216,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xd220",
-                    "hash" : "0xfbdbe9680ef7274dc326182459f68435a5440ff30b02156763e2f66ebf594362",
-                    "mixHash" : "0xee428d0289f34458873bd68bb39723e389decb6a67611e8378fcb09d57485d16",
-                    "nonce" : "0x2c635fbdc06b7fef",
+                    "gasUsed" : "0xd20e",
+                    "hash" : "0x9bdc0af4c287595bc7f95386f3997d374fd03a429b06c135c8f49d8c2baf092f",
+                    "mixHash" : "0xf1510002ea1c24733ddfcf94079a5629da356bc3e2ab58af5126760d1f1966c8",
+                    "nonce" : "0xdc45ec9631e1c2b4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xda71f4aeec6f346b4e310f31db7535976ee12d1722557f0bf39a8c96bf6ad3b3",
-                    "stateRoot" : "0xbb35d62c4a81a857fb2e5144a5b7a2ad8b61f5b2f02d8456247b8bcc6e1a1a5c",
+                    "receiptTrie" : "0x3575468911683eca88c7d6d075d5a63c68c5a543905e53eee6d14293ea43b90a",
+                    "stateRoot" : "0x80d554d86074a6eb1e80018f203ef438917931d16e5b449e1f34d5b359b4ec8c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb35d62c4a81a857fb2e5144a5b7a2ad8b61f5b2f02d8456247b8bcc6e1a1a5ca0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a0da71f4aeec6f346b4e310f31db7535976ee12d1722557f0bf39a8c96bf6ad3b3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d2208203e880a0ee428d0289f34458873bd68bb39723e389decb6a67611e8378fcb09d57485d16882c635fbdc06b7feff85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080d554d86074a6eb1e80018f203ef438917931d16e5b449e1f34d5b359b4ec8ca0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a03575468911683eca88c7d6d075d5a63c68c5a543905e53eee6d14293ea43b90ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d20e8203e880a0f1510002ea1c24733ddfcf94079a5629da356bc3e2ab58af5126760d1f1966c888dc45ec9631e1c2b4f85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -265,11 +265,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbdbe9680ef7274dc326182459f68435a5440ff30b02156763e2f66ebf594362",
+        "lastblockhash" : "0x9bdc0af4c287595bc7f95386f3997d374fd03a429b06c135c8f49d8c2baf092f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d220",
+                "balance" : "0x4563918244f4d20e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -283,7 +283,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a740",
+                "balance" : "0x0de0b6b3a761a752",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -303,8 +303,8 @@
     "badOpcodes_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -314,27 +314,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xd220",
-                    "hash" : "0xdef82c3e633be803db657a3a2814a9d645ec8fdb310d37befc6ec234b42831c5",
-                    "mixHash" : "0xe85a25d077c8d4a7e459986e767a3375cb156f12897f5dfe5b8a50454bfc752a",
-                    "nonce" : "0x015cc629c2c50647",
+                    "gasUsed" : "0xd20e",
+                    "hash" : "0xcf9aec910f61e6183517d32b8d971d295c0ec0f831773b84ec0bdcd4dc9e9181",
+                    "mixHash" : "0xac5ceb8be934a1b78b938606b23ff7643f5472a436f91660950217dbc06976bd",
+                    "nonce" : "0xb3e50735136dbd8e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x18deb30faecbac2f4b7828a87115b068aa9264d26674db3a7306f96dc3e6239e",
-                    "stateRoot" : "0x1b5e6311657a880169ef871c0543b04e7e457c2f760ac4ed18ace66e49555c5b",
+                    "receiptTrie" : "0xc4669cd354994ab375e1b739362699848950e54199f9fdde24dca38f47ec3197",
+                    "stateRoot" : "0x08d376fcfa2ea841d3240e39cc4c5d1211644319aa9adf4d5ddef6e147d0ba72",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5e6311657a880169ef871c0543b04e7e457c2f760ac4ed18ace66e49555c5ba0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a018deb30faecbac2f4b7828a87115b068aa9264d26674db3a7306f96dc3e6239eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d2208203e880a0e85a25d077c8d4a7e459986e767a3375cb156f12897f5dfe5b8a50454bfc752a88015cc629c2c50647f85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa008d376fcfa2ea841d3240e39cc4c5d1211644319aa9adf4d5ddef6e147d0ba72a0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a0c4669cd354994ab375e1b739362699848950e54199f9fdde24dca38f47ec3197b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d20e8203e880a0ac5ceb8be934a1b78b938606b23ff7643f5472a436f91660950217dbc06976bd88b3e50735136dbd8ef85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -363,11 +363,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdef82c3e633be803db657a3a2814a9d645ec8fdb310d37befc6ec234b42831c5",
+        "lastblockhash" : "0xcf9aec910f61e6183517d32b8d971d295c0ec0f831773b84ec0bdcd4dc9e9181",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d220",
+                "balance" : "0x4563918244f4d20e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -381,7 +381,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a740",
+                "balance" : "0x0de0b6b3a761a752",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -401,8 +401,8 @@
     "badOpcodes_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -412,27 +412,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x5520",
-                    "hash" : "0x1f28a04ba1695a613669078e798ff68cf587e711b985f1ceab81a1367d713229",
-                    "mixHash" : "0x4406d28b46c2a562d699cd6b4b05dd6949a97e2bb667fda3d48b6f63cf24b343",
-                    "nonce" : "0xdc2add0502198dd1",
+                    "gasUsed" : "0x550e",
+                    "hash" : "0x13362b656f41be563bf2b201a7dd91e89f73ba8a7759715fe6fde495535897f7",
+                    "mixHash" : "0xea8a1c7a7333c9cf8987daa17e277d8a509d5e38e336fac3753e286b31f06c41",
+                    "nonce" : "0x3124c7659b4126bd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0x4131ce0dbd2eb0484b79f9ce004cbc5903d55b77098ac34e3260eb7adb4a4dd9",
-                    "stateRoot" : "0x9f2623f6b78b45f3bd5fe3ba8bc38f610a83322c9b7e361d0b8c1c480677ace0",
+                    "receiptTrie" : "0x393e6075cb483849db9e566848ef882d282ba6970b99915e9c6dfb119c2d2e07",
+                    "stateRoot" : "0xe3dfd64a6f441c6c06ea7332edd703e11cde17910672ee85e2973e03b282478e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f2623f6b78b45f3bd5fe3ba8bc38f610a83322c9b7e361d0b8c1c480677ace0a0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a04131ce0dbd2eb0484b79f9ce004cbc5903d55b77098ac34e3260eb7adb4a4dd9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408255208203e880a04406d28b46c2a562d699cd6b4b05dd6949a97e2bb667fda3d48b6f63cf24b34388dc2add0502198dd1f85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e3dfd64a6f441c6c06ea7332edd703e11cde17910672ee85e2973e03b282478ea0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a0393e6075cb483849db9e566848ef882d282ba6970b99915e9c6dfb119c2d2e07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082550e8203e880a0ea8a1c7a7333c9cf8987daa17e277d8a509d5e38e336fac3753e286b31f06c41883124c7659b4126bdf85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -461,11 +461,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f28a04ba1695a613669078e798ff68cf587e711b985f1ceab81a1367d713229",
+        "lastblockhash" : "0x13362b656f41be563bf2b201a7dd91e89f73ba8a7759715fe6fde495535897f7",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45520",
+                "balance" : "0x4563918244f4550e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -479,7 +479,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7622440",
+                "balance" : "0x0de0b6b3a7622452",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -499,8 +499,8 @@
     "badOpcodes_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d0g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -510,27 +510,27 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xd220",
-                    "hash" : "0x51deefd4b264b7e3040fff4a8048c8636d0a3ec8c4bb98ae030a139c57f42f0e",
-                    "mixHash" : "0xc5323163d665aa87f82d9c660d3169a45723279e79ed2e236457d7ba281c6463",
-                    "nonce" : "0xca0f7a65a00623de",
+                    "gasUsed" : "0xd20e",
+                    "hash" : "0x6b95cf1ba6b8546df2b31c09fb9449cb0cdff91d5b116b2e11821f54268bd460",
+                    "mixHash" : "0xdee97b267b4d728a9aec0b5dad35511f65864d034d67500ccb4940912c2280c3",
+                    "nonce" : "0x9ae035b3414384f9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
-                    "receiptTrie" : "0xda71f4aeec6f346b4e310f31db7535976ee12d1722557f0bf39a8c96bf6ad3b3",
-                    "stateRoot" : "0xbb35d62c4a81a857fb2e5144a5b7a2ad8b61f5b2f02d8456247b8bcc6e1a1a5c",
+                    "receiptTrie" : "0x3575468911683eca88c7d6d075d5a63c68c5a543905e53eee6d14293ea43b90a",
+                    "stateRoot" : "0x80d554d86074a6eb1e80018f203ef438917931d16e5b449e1f34d5b359b4ec8c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013",
+                    "transactionsTrie" : "0xf7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb35d62c4a81a857fb2e5144a5b7a2ad8b61f5b2f02d8456247b8bcc6e1a1a5ca0a1e2fc73a2796c398fa1c556266566e0f3df32ec2e7ee1be83a46cd169a52013a0da71f4aeec6f346b4e310f31db7535976ee12d1722557f0bf39a8c96bf6ad3b3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d2208203e880a0c5323163d665aa87f82d9c660d3169a45723279e79ed2e236457d7ba281c646388ca0f7a65a00623def85ff85d800183061a8080830186a08e60016001600160014000006000f31ba02fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9aa03acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651c0",
+                "rlp" : "0xf9025cf901f7a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080d554d86074a6eb1e80018f203ef438917931d16e5b449e1f34d5b359b4ec8ca0f7906c80a7e43e8082af4a2534c3c97c6dfd5e6d890e7483e53ba3bb4d609e20a03575468911683eca88c7d6d075d5a63c68c5a543905e53eee6d14293ea43b90ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082d20e8203e880a0dee97b267b4d728a9aec0b5dad35511f65864d034d67500ccb4940912c2280c3889ae035b3414384f9f85ff85d800183061a8080830186a08e60016001600160015800006000f31ba09a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3a07c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464c0",
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014000006000f3",
+                        "data" : "0x60016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2fba542f12a4b49703e217569bc62dde7165b8e5dc27a9a8ff6af18c16415e9a",
-                        "s" : "0x3acde1890c3c116f7c80927fd8ff9e311fc88f1534dbf56aa3778d9fed771651",
+                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
+                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
@@ -559,11 +559,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51deefd4b264b7e3040fff4a8048c8636d0a3ec8c4bb98ae030a139c57f42f0e",
+        "lastblockhash" : "0x6b95cf1ba6b8546df2b31c09fb9449cb0cdff91d5b116b2e11821f54268bd460",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d220",
+                "balance" : "0x4563918244f4d20e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -577,7 +577,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a740",
+                "balance" : "0x0de0b6b3a761a752",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0.json
index 6a15741fd..97244638d 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d100g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0a1eb75b077519fde175fcb119cd81015efde16d32368f086b65888f249be2e9",
-                    "mixHash" : "0xcdb13acf99d3e6465f2059edeb94eee2d5cf22fa29c9bce55030f4e18f966d0e",
-                    "nonce" : "0x24f651d84300a35f",
+                    "hash" : "0x19fd49cc44a9b50e46bd085f1120c602c7eca79b5460f73736a2c49c0291d3f5",
+                    "mixHash" : "0xb889943f1e5418470b0b94562b3dba2fdbf170320f25ba055e03b9e17f521fb8",
+                    "nonce" : "0xcaa8a1d5a60396b7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cdb13acf99d3e6465f2059edeb94eee2d5cf22fa29c9bce55030f4e18f966d0e8824f651d84300a35ff85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b889943f1e5418470b0b94562b3dba2fdbf170320f25ba055e03b9e17f521fb888caa8a1d5a60396b7f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a1eb75b077519fde175fcb119cd81015efde16d32368f086b65888f249be2e9",
+        "lastblockhash" : "0x19fd49cc44a9b50e46bd085f1120c602c7eca79b5460f73736a2c49c0291d3f5",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d100g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x41908975cc95fc68312c01427db80fd883ae2d712342629de77bbc8c6f91f1af",
-                    "mixHash" : "0x6c72e32a7cec7e2ebd2635125fd2b9b082e12a7c4caf623cb57f1d5a9de80131",
-                    "nonce" : "0xbcd72e0ef02401ba",
+                    "hash" : "0xdf7b9cbe8eee572371c8d5c636c2c5bf3ca85c2338650e5cb3d03963b0178c83",
+                    "mixHash" : "0x436fac4ed00aae9e24ce701eaacef28b6a15f2bd02f8fbca653e6998fcf3fc34",
+                    "nonce" : "0x5c1e864506625cd5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06c72e32a7cec7e2ebd2635125fd2b9b082e12a7c4caf623cb57f1d5a9de8013188bcd72e0ef02401baf85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0436fac4ed00aae9e24ce701eaacef28b6a15f2bd02f8fbca653e6998fcf3fc34885c1e864506625cd5f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41908975cc95fc68312c01427db80fd883ae2d712342629de77bbc8c6f91f1af",
+        "lastblockhash" : "0xdf7b9cbe8eee572371c8d5c636c2c5bf3ca85c2338650e5cb3d03963b0178c83",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d100g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8b594010f8fcba85461988eceb309fac079f810b60d85c9e7816a537913975fa",
-                    "mixHash" : "0x0240f70a99a3720577be803ae906f4868509c2f0b670ed44259b49b84be5838a",
-                    "nonce" : "0x4011272f342e6099",
+                    "hash" : "0x8020fd2f82e92116d0257d218061e5b1741fbca6032645f490de49651ec6917f",
+                    "mixHash" : "0xeb0064f1d0a7004469ba7066e562e22851e87d1d2ff00ece73083903e7f9b4d0",
+                    "nonce" : "0x64b509636a41f2b7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00240f70a99a3720577be803ae906f4868509c2f0b670ed44259b49b84be5838a884011272f342e6099f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eb0064f1d0a7004469ba7066e562e22851e87d1d2ff00ece73083903e7f9b4d08864b509636a41f2b7f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b594010f8fcba85461988eceb309fac079f810b60d85c9e7816a537913975fa",
+        "lastblockhash" : "0x8020fd2f82e92116d0257d218061e5b1741fbca6032645f490de49651ec6917f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d100g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x084061c5cbe7ca7acf0e85f0f1d76a11a3866f0ed2878d027ace10213891d897",
-                    "mixHash" : "0x2c159f6e7d8f6b4d22ba962a2674999c4acf1e4a902037dbd8da4df84196640e",
-                    "nonce" : "0xa549e22501e1dd22",
+                    "hash" : "0x3f196e80112f5e38a3423119143c48b428dfa49bba152bce90c65e75cf79ba3b",
+                    "mixHash" : "0x5b380ec06afd8ac9458f07e8b5d8070ed78c049bbf0e21c31a068a14a0c4b0d5",
+                    "nonce" : "0x91dfb19bea1b29ba",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c159f6e7d8f6b4d22ba962a2674999c4acf1e4a902037dbd8da4df84196640e88a549e22501e1dd22f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b380ec06afd8ac9458f07e8b5d8070ed78c049bbf0e21c31a068a14a0c4b0d58891dfb19bea1b29baf85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x084061c5cbe7ca7acf0e85f0f1d76a11a3866f0ed2878d027ace10213891d897",
+        "lastblockhash" : "0x3f196e80112f5e38a3423119143c48b428dfa49bba152bce90c65e75cf79ba3b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d100g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc48bd5108d9f7e48bdd729bfcc3e84d4b9081c1a7706a6a281879671d8fd9b9a",
-                    "mixHash" : "0x82893e33e67f795c9792a5b4f36ead54e6f2610328b9f4e0bc1ce01856c4bd5b",
-                    "nonce" : "0xe51f0cb49924f3b5",
+                    "hash" : "0x3793f8a8db853adb88fa8f6aa27be88a2bce2e5c60429e75922e935dfad9e3bf",
+                    "mixHash" : "0x36abdbceb817446fb20ff99c8b9e6b72d1dd9b45ab7adbd774465db7cd446520",
+                    "nonce" : "0x54405cdc36cdaf57",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082893e33e67f795c9792a5b4f36ead54e6f2610328b9f4e0bc1ce01856c4bd5b88e51f0cb49924f3b5f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a036abdbceb817446fb20ff99c8b9e6b72d1dd9b45ab7adbd774465db7cd4465208854405cdc36cdaf57f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc48bd5108d9f7e48bdd729bfcc3e84d4b9081c1a7706a6a281879671d8fd9b9a",
+        "lastblockhash" : "0x3793f8a8db853adb88fa8f6aa27be88a2bce2e5c60429e75922e935dfad9e3bf",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d100g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d100g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x07e7d992204bfe51f9cf55b8b2b7525fd60767f9abc9e5ddf5d6ae143331fc88",
-                    "mixHash" : "0x598977d6dbdbf0018e5bff682448b155112afba103e65fb18fe200d30c0b64e5",
-                    "nonce" : "0xb668143a7c184a42",
+                    "hash" : "0xbe1e16e715f4395f4bfb37e81d6cb347e8295dac1a2a471ce854ca254099a954",
+                    "mixHash" : "0x730304f45fa89db821dbb2a89868325bea1f118cecec8c3903f9b49e44a6667c",
+                    "nonce" : "0xf5776aebd28c275a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0598977d6dbdbf0018e5bff682448b155112afba103e65fb18fe200d30c0b64e588b668143a7c184a42f85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bb309b606bcd3988748c3c78076c2b69be22b5785ea1142dc04285b0bcfe4634a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0730304f45fa89db821dbb2a89868325bea1f118cecec8c3903f9b49e44a6667c88f5776aebd28c275af85ff85d800183061a8080830186a08e6001600160016001e160006000f31ba0ade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372a05fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e160006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07e7d992204bfe51f9cf55b8b2b7525fd60767f9abc9e5ddf5d6ae143331fc88",
+        "lastblockhash" : "0xbe1e16e715f4395f4bfb37e81d6cb347e8295dac1a2a471ce854ca254099a954",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0.json
index 40c19bb21..4e4e26631 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d101g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcd2d3009f6f56b5d28f4709ad81e2973d0bf83697637e785429a422c8d63a80d",
-                    "mixHash" : "0xac7e73e4ff6d752362af4a05c0aa24aeba82fcefd2e4d6af5b248b630fea8384",
-                    "nonce" : "0xdb2a860fe3f45516",
+                    "hash" : "0x523947455326f30f45255c030206611e42ad0cb303a732aef0e54307afcb64a0",
+                    "mixHash" : "0x7254e8dc39b2db47285b7e7e342c6b42963378421f8909a1f9f935ae1d48cde7",
+                    "nonce" : "0x5976cf408a82485a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac7e73e4ff6d752362af4a05c0aa24aeba82fcefd2e4d6af5b248b630fea838488db2a860fe3f45516f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07254e8dc39b2db47285b7e7e342c6b42963378421f8909a1f9f935ae1d48cde7885976cf408a82485af85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd2d3009f6f56b5d28f4709ad81e2973d0bf83697637e785429a422c8d63a80d",
+        "lastblockhash" : "0x523947455326f30f45255c030206611e42ad0cb303a732aef0e54307afcb64a0",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d101g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa03436ea8ca66dd6786debc8970bfc561584822643df14ef504ff59b9250d9bd",
-                    "mixHash" : "0xaa9ba100d1bf602354e913d2b8a27dc75d15849cf7036a1a510decb24e230d3f",
-                    "nonce" : "0x626036ced3cac543",
+                    "hash" : "0xa8c8caccab8f21750a8a4d976f39b448e591d0b67f6ff1f0e6e563eed0b26d7a",
+                    "mixHash" : "0xa65f981edb0ce82f41ef0396b67dd61e532425e13d702bb0fb2c49f68baa2595",
+                    "nonce" : "0x52465993364b829d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aa9ba100d1bf602354e913d2b8a27dc75d15849cf7036a1a510decb24e230d3f88626036ced3cac543f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a65f981edb0ce82f41ef0396b67dd61e532425e13d702bb0fb2c49f68baa25958852465993364b829df85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa03436ea8ca66dd6786debc8970bfc561584822643df14ef504ff59b9250d9bd",
+        "lastblockhash" : "0xa8c8caccab8f21750a8a4d976f39b448e591d0b67f6ff1f0e6e563eed0b26d7a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d101g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x43706ee156c791a92b8d7ece105a3737ee1e252e4a7851c45102ceb22b31c231",
-                    "mixHash" : "0xc89477f7226bd39df3de2d72903038052cb26d5a89e54f0b02039dfd26512406",
-                    "nonce" : "0xf1466555abc95e93",
+                    "hash" : "0x54cb1329daa8a912cebff9fa7f05d2f714e955fc3ab4032c91cc82bd57eb6deb",
+                    "mixHash" : "0xc7747aa4822b379d8ddd468c744253926940754dc338c794f5b6fec5bcf0155d",
+                    "nonce" : "0x6bed579def6593a2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c89477f7226bd39df3de2d72903038052cb26d5a89e54f0b02039dfd2651240688f1466555abc95e93f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c7747aa4822b379d8ddd468c744253926940754dc338c794f5b6fec5bcf0155d886bed579def6593a2f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43706ee156c791a92b8d7ece105a3737ee1e252e4a7851c45102ceb22b31c231",
+        "lastblockhash" : "0x54cb1329daa8a912cebff9fa7f05d2f714e955fc3ab4032c91cc82bd57eb6deb",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d101g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf76d78bdf27512e6a8753989ab6639f320415c297e591dc73af9ccaddea85dce",
-                    "mixHash" : "0xc62ff23379eb7edd29f6b03c62352101c403afd965a6f0f0fa3d0a91f1055e68",
-                    "nonce" : "0xf2e5eac1bce7609f",
+                    "hash" : "0x7bce207d0450918e7ff7fc68a8285db982a719a799e560dc2ca09fafe01ce48b",
+                    "mixHash" : "0xfcc57f7962dede648e098b19ab98a6fa1e6a8826364cc643a0cdf968cea20567",
+                    "nonce" : "0x8e9c297d4d4d65b4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c62ff23379eb7edd29f6b03c62352101c403afd965a6f0f0fa3d0a91f1055e6888f2e5eac1bce7609ff85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fcc57f7962dede648e098b19ab98a6fa1e6a8826364cc643a0cdf968cea20567888e9c297d4d4d65b4f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf76d78bdf27512e6a8753989ab6639f320415c297e591dc73af9ccaddea85dce",
+        "lastblockhash" : "0x7bce207d0450918e7ff7fc68a8285db982a719a799e560dc2ca09fafe01ce48b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d101g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x01600d4f6480de4a348450dbac352709a5fa9a54fe44e5fa600866746040e820",
-                    "mixHash" : "0x5b652fc28f0294af1b84f1283492f49f9900add5e36323ac4324c49e5e213c2b",
-                    "nonce" : "0x7f4cde3f0dd09042",
+                    "hash" : "0x27d108b564599c7686146dc4ed5d79a85bc401a858e626207fe916085fecb0f3",
+                    "mixHash" : "0xda7d4f82154c0c65b446eb7dba2c1b7f50a8f33f5e04ed883acf713ed5485801",
+                    "nonce" : "0x99a7f8e16e3c52a4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b652fc28f0294af1b84f1283492f49f9900add5e36323ac4324c49e5e213c2b887f4cde3f0dd09042f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0da7d4f82154c0c65b446eb7dba2c1b7f50a8f33f5e04ed883acf713ed54858018899a7f8e16e3c52a4f85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01600d4f6480de4a348450dbac352709a5fa9a54fe44e5fa600866746040e820",
+        "lastblockhash" : "0x27d108b564599c7686146dc4ed5d79a85bc401a858e626207fe916085fecb0f3",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d101g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d101g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9b78e5b18f81d6def2ec22ac8995428230014a85a4dd57c29a54703084251587",
-                    "mixHash" : "0xc6588bd7bd9dec45255a881ac9afce66af02e387c6ca9081057a9a4e239ac815",
-                    "nonce" : "0xf0fcccf9ec374c7e",
+                    "hash" : "0x68ec17d667bac563770417ef7258e7e3ff944c126db47de0ee6c7f13f1a6d30d",
+                    "mixHash" : "0x97cc61f226d03e2b18703c792e3bbc9843c473874a82382dc87475a2df0c3812",
+                    "nonce" : "0x43f6a0111643448f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x7f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c6588bd7bd9dec45255a881ac9afce66af02e387c6ca9081057a9a4e239ac81588f0fcccf9ec374c7ef85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07f5a4a0433edc787632f08b2352e5bc2b615ac63305d52fd8e389cd8d9ceb485a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a097cc61f226d03e2b18703c792e3bbc9843c473874a82382dc87475a2df0c38128843f6a0111643448ff85ff85d800183061a8080830186a08e6001600160016001e260006000f31ca030f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868a04c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e260006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b78e5b18f81d6def2ec22ac8995428230014a85a4dd57c29a54703084251587",
+        "lastblockhash" : "0x68ec17d667bac563770417ef7258e7e3ff944c126db47de0ee6c7f13f1a6d30d",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0.json
index 45535dbb5..5395dda3a 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d102g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3906e598f6f7c93ccc95e68c09af8f194056859a05df70d4147b75e254cf3030",
-                    "mixHash" : "0x43a990401789a1396d30aa90cfeae883eac14ba12d04325a4421c38064c6a72d",
-                    "nonce" : "0x97bf916b340dcd63",
+                    "hash" : "0x1631dda7cc44153015b3ea2755bebe3819a163a0bb4789f57a6bd1f7c7966163",
+                    "mixHash" : "0x87f673e16557d94636b58d98e91a45c7abef43cf2cd937b3f39ce6ac937510c7",
+                    "nonce" : "0xe3f59a62bd9810ec",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043a990401789a1396d30aa90cfeae883eac14ba12d04325a4421c38064c6a72d8897bf916b340dcd63f85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a087f673e16557d94636b58d98e91a45c7abef43cf2cd937b3f39ce6ac937510c788e3f59a62bd9810ecf85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3906e598f6f7c93ccc95e68c09af8f194056859a05df70d4147b75e254cf3030",
+        "lastblockhash" : "0x1631dda7cc44153015b3ea2755bebe3819a163a0bb4789f57a6bd1f7c7966163",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d102g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe717c5d263947d7ae871b4a2256d8e020815d0ce47d741559a9ab9772098761e",
-                    "mixHash" : "0xffef9ad15dd408a83e08b5933612e24988ef5352e5bff5f427fd9e67faf161aa",
-                    "nonce" : "0xe9bd593082c9d97f",
+                    "hash" : "0x4e1db90fa0ff56fc5727aea399ef0ece305f71727b6f7c61cd684b5532a04947",
+                    "mixHash" : "0x661c4a01f44e77dc17395c983113f37262466e86cecbca611b98561d327e6325",
+                    "nonce" : "0xa7f98070480cebfb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffef9ad15dd408a83e08b5933612e24988ef5352e5bff5f427fd9e67faf161aa88e9bd593082c9d97ff85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0661c4a01f44e77dc17395c983113f37262466e86cecbca611b98561d327e632588a7f98070480cebfbf85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe717c5d263947d7ae871b4a2256d8e020815d0ce47d741559a9ab9772098761e",
+        "lastblockhash" : "0x4e1db90fa0ff56fc5727aea399ef0ece305f71727b6f7c61cd684b5532a04947",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d102g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7e79b32dc6b3a15984cd04d3669d8f86d4285588feabbec4dd0d77d9e8d7a5c7",
-                    "mixHash" : "0x318bb1a34ae93e9f5e811ea5f0268b1e64c03a28fca21f59039c1bd76c1887ab",
-                    "nonce" : "0xdb6989390f102dcf",
+                    "hash" : "0x4203c9f37bee913ee6eda858a3e5d5ea647eb3b9284200705d546bf81644983a",
+                    "mixHash" : "0x2f5efeb71586c386fc8269104814717f2345fb65282b3bb4f89efb19cfb11b99",
+                    "nonce" : "0xe30de884514a895e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0318bb1a34ae93e9f5e811ea5f0268b1e64c03a28fca21f59039c1bd76c1887ab88db6989390f102dcff85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02f5efeb71586c386fc8269104814717f2345fb65282b3bb4f89efb19cfb11b9988e30de884514a895ef85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e79b32dc6b3a15984cd04d3669d8f86d4285588feabbec4dd0d77d9e8d7a5c7",
+        "lastblockhash" : "0x4203c9f37bee913ee6eda858a3e5d5ea647eb3b9284200705d546bf81644983a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d102g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc2ab98c20ac72c838bff35d9313c999e7cd25e915aacf3f3d4f1b7ac102a59a6",
-                    "mixHash" : "0x8fc49f1e1f3247fd4192e8d60b35fb984ce87ab54342a3c25a5596e5cf5016c9",
-                    "nonce" : "0x992b33fcfa32f999",
+                    "hash" : "0x9cb2c9e94cc926c3f4ec5ebb6857145f0be8e27f7e9807070ba60d94f61f75f3",
+                    "mixHash" : "0xf2d6a79e7c98322acb66abba836843fe84a32adffd643b84abd8575f4d86539a",
+                    "nonce" : "0x7a32c01ecd47daf1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08fc49f1e1f3247fd4192e8d60b35fb984ce87ab54342a3c25a5596e5cf5016c988992b33fcfa32f999f85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f2d6a79e7c98322acb66abba836843fe84a32adffd643b84abd8575f4d86539a887a32c01ecd47daf1f85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2ab98c20ac72c838bff35d9313c999e7cd25e915aacf3f3d4f1b7ac102a59a6",
+        "lastblockhash" : "0x9cb2c9e94cc926c3f4ec5ebb6857145f0be8e27f7e9807070ba60d94f61f75f3",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d102g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf55fea2269f5ace8b550dbaabe3eeaa0be07b82f120b340a482332735babae0f",
-                    "mixHash" : "0x2920b37c516fb2e54b48b894f63750313bde04603d488c027702d06a2fa07356",
-                    "nonce" : "0xdec474682b4af2d6",
+                    "hash" : "0x8a3cb979b92665c245d8b095ad344a8b0f22feff9d9ee8aa0e4370a5193e7520",
+                    "mixHash" : "0x5c699d05fe38330ed4273dd34a5efb5a11d777ffe811d30c1e6077f62e9663e3",
+                    "nonce" : "0x2f4639a109f7589d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02920b37c516fb2e54b48b894f63750313bde04603d488c027702d06a2fa0735688dec474682b4af2d6f85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05c699d05fe38330ed4273dd34a5efb5a11d777ffe811d30c1e6077f62e9663e3882f4639a109f7589df85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf55fea2269f5ace8b550dbaabe3eeaa0be07b82f120b340a482332735babae0f",
+        "lastblockhash" : "0x8a3cb979b92665c245d8b095ad344a8b0f22feff9d9ee8aa0e4370a5193e7520",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d102g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d102g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe97b9917f28958a1fc0b3a84ff6675c42c2fbc6714bca738db63519fac63ad2b",
-                    "mixHash" : "0x295e9ebe1ea8935ab476881b4341bca846bd49f6a89bbf772c20c84faa1714b8",
-                    "nonce" : "0x3f759bcaef18abd5",
+                    "hash" : "0xb82ab791d9f23a1a44da97ebf698ef28bba4affc84fc0c06c29e90bfdce3dff5",
+                    "mixHash" : "0x9401bb55e3d5a11ab1b5a2ed5f31de6df670554d148534aaa377221d4bb6e44c",
+                    "nonce" : "0x6c3c6bc50ee59c9b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0295e9ebe1ea8935ab476881b4341bca846bd49f6a89bbf772c20c84faa1714b8883f759bcaef18abd5f85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b9df86fe850e82328b378abab79d6c5c31126c25944ade62dcdc98f0d78b6756a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09401bb55e3d5a11ab1b5a2ed5f31de6df670554d148534aaa377221d4bb6e44c886c3c6bc50ee59c9bf85ff85d800183061a8080830186a08e6001600160016001e360006000f31ca01a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02a02c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e360006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe97b9917f28958a1fc0b3a84ff6675c42c2fbc6714bca738db63519fac63ad2b",
+        "lastblockhash" : "0xb82ab791d9f23a1a44da97ebf698ef28bba4affc84fc0c06c29e90bfdce3dff5",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0.json
index 5dca1d9b5..3b6dabd7a 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d103g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf34127a099d96b13266278cb79ed6e7906ba0001e080db94ba15ab57252b9c4d",
-                    "mixHash" : "0x3545ecbe2c614cbf2357bd4c608bf2df631d6f1f642e09cbd2ec29de7af4f17b",
-                    "nonce" : "0x5561f0c3cac5e596",
+                    "hash" : "0x89f37057ef92b95aa8d139be4ba35ff6cfd676bca74d48490e414e7b581e2f03",
+                    "mixHash" : "0xe6f467dd062d1599e442d108ae7028bbba40bd94f5d77c91c53a87cb0aca23d5",
+                    "nonce" : "0xec8fce7ef8719535",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03545ecbe2c614cbf2357bd4c608bf2df631d6f1f642e09cbd2ec29de7af4f17b885561f0c3cac5e596f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e6f467dd062d1599e442d108ae7028bbba40bd94f5d77c91c53a87cb0aca23d588ec8fce7ef8719535f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf34127a099d96b13266278cb79ed6e7906ba0001e080db94ba15ab57252b9c4d",
+        "lastblockhash" : "0x89f37057ef92b95aa8d139be4ba35ff6cfd676bca74d48490e414e7b581e2f03",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d103g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x83c5cb9b838e56d9c32df6da2d64cd64863360b66596e8909e5db14a1b076591",
-                    "mixHash" : "0xd81f8e8f1c36568869058e14b8fc6109e18271af702e760c60b087c3d69c4fd3",
-                    "nonce" : "0xaeff6306ef05b5b8",
+                    "hash" : "0xa33a709a8c03457f044af2164a6619ea5c4d4a2a4a67a6fa2f4a05ebe653bbdc",
+                    "mixHash" : "0xd9486290f9112d769dd1d155c19370c1f2f9ed3b77fb49b460b0513b444890a8",
+                    "nonce" : "0x553bdbf37d399cbb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d81f8e8f1c36568869058e14b8fc6109e18271af702e760c60b087c3d69c4fd388aeff6306ef05b5b8f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d9486290f9112d769dd1d155c19370c1f2f9ed3b77fb49b460b0513b444890a888553bdbf37d399cbbf85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83c5cb9b838e56d9c32df6da2d64cd64863360b66596e8909e5db14a1b076591",
+        "lastblockhash" : "0xa33a709a8c03457f044af2164a6619ea5c4d4a2a4a67a6fa2f4a05ebe653bbdc",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d103g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfaf1bcdc386b014bb74089375149bc3392472167ca0c0a65b7eff70eaa3703ad",
-                    "mixHash" : "0xf7eadecbea7ac10bcc0c32b3664256d469dcfbc021321c41bc89b017a2b9084d",
-                    "nonce" : "0x7804e103379e6844",
+                    "hash" : "0xdf3ce58e6ddf891af6d8d371856c4bbd0e1189a7cfa72914346d5076dbbf2e14",
+                    "mixHash" : "0xbeb1f8a171466ad34475c1b6c31a466c6ffe4938908762d62eab0d86acf34fc3",
+                    "nonce" : "0x8126b2c323475ff7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f7eadecbea7ac10bcc0c32b3664256d469dcfbc021321c41bc89b017a2b9084d887804e103379e6844f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0beb1f8a171466ad34475c1b6c31a466c6ffe4938908762d62eab0d86acf34fc3888126b2c323475ff7f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfaf1bcdc386b014bb74089375149bc3392472167ca0c0a65b7eff70eaa3703ad",
+        "lastblockhash" : "0xdf3ce58e6ddf891af6d8d371856c4bbd0e1189a7cfa72914346d5076dbbf2e14",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d103g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2edf912d2d832dbde19201d4876516ce81dbc56562e63afd0dbe36f04b8af283",
-                    "mixHash" : "0x4326769d09c4df56f8f4e618bd048019d71d924bb6b369e50098c7ae301188b3",
-                    "nonce" : "0x164ad602aa6dfc46",
+                    "hash" : "0xf5bf418d3758a01c4224916cee9580f45a75d9795bafb6d4ca1adf4f46058adb",
+                    "mixHash" : "0xc394592ca3cffb68caba87ae62b6ca7d73ce162d1ad7098a2755cc4a5618c25a",
+                    "nonce" : "0x40a7518cff9b5b8f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04326769d09c4df56f8f4e618bd048019d71d924bb6b369e50098c7ae301188b388164ad602aa6dfc46f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c394592ca3cffb68caba87ae62b6ca7d73ce162d1ad7098a2755cc4a5618c25a8840a7518cff9b5b8ff85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2edf912d2d832dbde19201d4876516ce81dbc56562e63afd0dbe36f04b8af283",
+        "lastblockhash" : "0xf5bf418d3758a01c4224916cee9580f45a75d9795bafb6d4ca1adf4f46058adb",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d103g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2a2995c1cfc95ae0b6bb02d13c80a4ffed38430cdbf64ac3ffa7190227cd545d",
-                    "mixHash" : "0x1b201deef0286b30a6bb9e04bbae95221e1bf11afadc21cab1f87fa0177d79d3",
-                    "nonce" : "0xd04aafe9b173c76c",
+                    "hash" : "0xbc75b10f56c4f01874140313bf9df4cdc97a97d648b345824e924b0e8b4f5baf",
+                    "mixHash" : "0xfd3447e08829b2af9ae06eda8d114e293efb90f2b90b906dca86145e1d5d39e8",
+                    "nonce" : "0x833e6d59271b6cbd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01b201deef0286b30a6bb9e04bbae95221e1bf11afadc21cab1f87fa0177d79d388d04aafe9b173c76cf85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fd3447e08829b2af9ae06eda8d114e293efb90f2b90b906dca86145e1d5d39e888833e6d59271b6cbdf85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a2995c1cfc95ae0b6bb02d13c80a4ffed38430cdbf64ac3ffa7190227cd545d",
+        "lastblockhash" : "0xbc75b10f56c4f01874140313bf9df4cdc97a97d648b345824e924b0e8b4f5baf",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d103g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d103g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1664778055f51fdc56b42b20c46b1e13d3bdce737ed4ec6757b93bc9183eaaa4",
-                    "mixHash" : "0x68427a10cb79f227efe17f676df7e679dd7d9bd73b7405c18cca527e851f603a",
-                    "nonce" : "0x32fef6d345980608",
+                    "hash" : "0xe8fb3bcc5e71d968f3f3ca1cabf3f8691bb9713aaebad99b192d6a15235e9f34",
+                    "mixHash" : "0x5b88d9a38f9eacbfb33dd21f053e7bccfa71a525793c60fbef05a2a245ac3d74",
+                    "nonce" : "0xea12e21858ca5c06",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a068427a10cb79f227efe17f676df7e679dd7d9bd73b7405c18cca527e851f603a8832fef6d345980608f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c564c6bba8940f82f3dfd8479f413ceb7e7dc36cc192afc78b97d306afe217ada054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b88d9a38f9eacbfb33dd21f053e7bccfa71a525793c60fbef05a2a245ac3d7488ea12e21858ca5c06f85ff85d800183061a8080830186a08e6001600160016001e460006000f31ba0e1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4a00db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e460006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1664778055f51fdc56b42b20c46b1e13d3bdce737ed4ec6757b93bc9183eaaa4",
+        "lastblockhash" : "0xe8fb3bcc5e71d968f3f3ca1cabf3f8691bb9713aaebad99b192d6a15235e9f34",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0.json
index 09acf96fc..a4d09263c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d104g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa11fc3dfa8c705c0cef5a919fbacb9a8bf383f17cbb6c663853b84fc882eb615",
-                    "mixHash" : "0x9ff62304847abbce48d5c4232e7b5922cbbdffa0864a8afe2bbce312db8ad3ba",
-                    "nonce" : "0x621a4cfad6f8de07",
+                    "hash" : "0x804ab76d2368b7a2e0bc6d1e364171e3e6d3553fb6bd68d181bfc754ecd22ec4",
+                    "mixHash" : "0x8ef29621d0a318a33bbb70afe1645c8b1403d65654bbe86a8ec054205992bca9",
+                    "nonce" : "0xf19596c9ec51a64c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09ff62304847abbce48d5c4232e7b5922cbbdffa0864a8afe2bbce312db8ad3ba88621a4cfad6f8de07f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08ef29621d0a318a33bbb70afe1645c8b1403d65654bbe86a8ec054205992bca988f19596c9ec51a64cf85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa11fc3dfa8c705c0cef5a919fbacb9a8bf383f17cbb6c663853b84fc882eb615",
+        "lastblockhash" : "0x804ab76d2368b7a2e0bc6d1e364171e3e6d3553fb6bd68d181bfc754ecd22ec4",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d104g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x824042939ca738006ce296daaaed81172d39e4e6a7f1c20bc21cca57f4956d1a",
-                    "mixHash" : "0x3a957bb3cef44dfdfb8ee778ddd342f859e0c2a764d3668c95fd2808b50e3ffd",
-                    "nonce" : "0xa1e7b87be6f422ae",
+                    "hash" : "0x7ecd4359b8d569a79ebe5328c7f6a61feb5204f9176cf8fc39b78fbea5a7a925",
+                    "mixHash" : "0xfcacba1a3d51e1152767be849cc6afe7f7d366690e02f55b1206c5aa3441a568",
+                    "nonce" : "0xc39f5d856278f62e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03a957bb3cef44dfdfb8ee778ddd342f859e0c2a764d3668c95fd2808b50e3ffd88a1e7b87be6f422aef85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fcacba1a3d51e1152767be849cc6afe7f7d366690e02f55b1206c5aa3441a56888c39f5d856278f62ef85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x824042939ca738006ce296daaaed81172d39e4e6a7f1c20bc21cca57f4956d1a",
+        "lastblockhash" : "0x7ecd4359b8d569a79ebe5328c7f6a61feb5204f9176cf8fc39b78fbea5a7a925",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d104g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xda8d44929cc7be5d422f44f7bdca3221eb21cbbbae2573de894a1bdb7a3ec5b6",
-                    "mixHash" : "0x6efa7282026fa5997ba8a0ca4db662097f656e96e21affabb424ebb598feb333",
-                    "nonce" : "0xc20150ed96ce2c94",
+                    "hash" : "0x6db2bf18451be8647ea83dcea03be3c30af818c45ba63af715912a9f7794ad3e",
+                    "mixHash" : "0x418a586e7b4bbcd2b5af05c37178a6aaa67bca4bce7a79c49635887f1a7466d8",
+                    "nonce" : "0xf2dcefed90d9aa87",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06efa7282026fa5997ba8a0ca4db662097f656e96e21affabb424ebb598feb33388c20150ed96ce2c94f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0418a586e7b4bbcd2b5af05c37178a6aaa67bca4bce7a79c49635887f1a7466d888f2dcefed90d9aa87f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda8d44929cc7be5d422f44f7bdca3221eb21cbbbae2573de894a1bdb7a3ec5b6",
+        "lastblockhash" : "0x6db2bf18451be8647ea83dcea03be3c30af818c45ba63af715912a9f7794ad3e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d104g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb0a5c824e8afc2901ae9dc380a078a995cfa96913c92e2065361d5cc24e8fc3c",
-                    "mixHash" : "0x0fb880821b097eeb357ee27e5734f1eb21d0bde6a8a2327665d4c7f209d525c3",
-                    "nonce" : "0x34bf4b897302a17f",
+                    "hash" : "0x0743a2ff309e99b9d65bffdfa50bf6086f69daf97085b1a4ef1db20a39b08383",
+                    "mixHash" : "0x2d0ad81072b8904e5b870a9469485984029fc267c15f27db04dad51649508dfe",
+                    "nonce" : "0x48f69cef308c1e71",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00fb880821b097eeb357ee27e5734f1eb21d0bde6a8a2327665d4c7f209d525c38834bf4b897302a17ff85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d0ad81072b8904e5b870a9469485984029fc267c15f27db04dad51649508dfe8848f69cef308c1e71f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0a5c824e8afc2901ae9dc380a078a995cfa96913c92e2065361d5cc24e8fc3c",
+        "lastblockhash" : "0x0743a2ff309e99b9d65bffdfa50bf6086f69daf97085b1a4ef1db20a39b08383",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d104g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x92cd45202ffed6de519c50d907d39202f8dce9d65336a951b81ca888316704c3",
-                    "mixHash" : "0xd881c3a4503abee67e1403b7b79adc826565717011d6ee184b0ca82e22bd5f70",
-                    "nonce" : "0x3f9ffb87275ab334",
+                    "hash" : "0x20b077e92046876ff9f648567d76ffd63d6015452ec8e72877432adec4bd1d24",
+                    "mixHash" : "0xb76ad25a1aaa8458c8fc081aa691946f4015932dbad7c7261d16e6569fea33bd",
+                    "nonce" : "0x839b3c6e30bb6c7d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d881c3a4503abee67e1403b7b79adc826565717011d6ee184b0ca82e22bd5f70883f9ffb87275ab334f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b76ad25a1aaa8458c8fc081aa691946f4015932dbad7c7261d16e6569fea33bd88839b3c6e30bb6c7df85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92cd45202ffed6de519c50d907d39202f8dce9d65336a951b81ca888316704c3",
+        "lastblockhash" : "0x20b077e92046876ff9f648567d76ffd63d6015452ec8e72877432adec4bd1d24",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d104g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d104g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x00efc3171c3d6a4589a4578f3589042f6bb84ebc7885a37dadfc00e4ca31421f",
-                    "mixHash" : "0xc4a217dea68a8e1f8cadfe2af3f38cdf8ff099f9e1016602cd8a1b3924115bb0",
-                    "nonce" : "0xb8716b9b9d8f8a64",
+                    "hash" : "0xce7441d43cc04e9f10ff806bcb746db3a4641fdeb0331624bd4aceef01334175",
+                    "mixHash" : "0xfb6c8417469da5b797f5f4da752bb57b59215ad2eebe41fe8f24720b63cf6698",
+                    "nonce" : "0x2436af352bb35bdc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x51db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c4a217dea68a8e1f8cadfe2af3f38cdf8ff099f9e1016602cd8a1b3924115bb088b8716b9b9d8f8a64f85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea051db3afef07acdcad1a5be52bd32caaca4ed4659d9dc1e1b840ad85575a11225a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb6c8417469da5b797f5f4da752bb57b59215ad2eebe41fe8f24720b63cf6698882436af352bb35bdcf85ff85d800183061a8080830186a08e6001600160016001e560006000f31ca0855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1a045e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00efc3171c3d6a4589a4578f3589042f6bb84ebc7885a37dadfc00e4ca31421f",
+        "lastblockhash" : "0xce7441d43cc04e9f10ff806bcb746db3a4641fdeb0331624bd4aceef01334175",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0.json
index 05f88b0a6..600f3cbb8 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d105g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1cce5f46a0a17ba0a4c18a86bc283332f84bb553e1daacdbfc010634ce2b708a",
-                    "mixHash" : "0xa4e0032ca2eddcc898569b8ec99a2059ef523da45a1e30437a51e9f20c1a5a73",
-                    "nonce" : "0x69f9e88e1f272a17",
+                    "hash" : "0x233071603afb199ef4f1fc46e2deba53cbeae30e32565ce64f80b31370946091",
+                    "mixHash" : "0x608a39bc91c3e5e9431686071b35199b0607986ec618670bafbed892884e0e38",
+                    "nonce" : "0xfaa356956196f701",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4e0032ca2eddcc898569b8ec99a2059ef523da45a1e30437a51e9f20c1a5a738869f9e88e1f272a17f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0608a39bc91c3e5e9431686071b35199b0607986ec618670bafbed892884e0e3888faa356956196f701f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1cce5f46a0a17ba0a4c18a86bc283332f84bb553e1daacdbfc010634ce2b708a",
+        "lastblockhash" : "0x233071603afb199ef4f1fc46e2deba53cbeae30e32565ce64f80b31370946091",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d105g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfe329f2ab7ba9c92c1399d1b721609a0f7f7a038532e6ca3fae5486953d03bc3",
-                    "mixHash" : "0x72cc158608143d6fe241bcbbbac56f6c72bffe5e3512264591943cd3ad6b8795",
-                    "nonce" : "0x0eda9dd40e0c3294",
+                    "hash" : "0x35c256f75f1afd7862a68940be13ef7a91605981cc13f68cd8aed3ef52998441",
+                    "mixHash" : "0x7a13371ab7d13f02ec4098ff647ea1fab33961ef1ee00324fdda7c42b845aab9",
+                    "nonce" : "0x4b93694e7097e9c5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a072cc158608143d6fe241bcbbbac56f6c72bffe5e3512264591943cd3ad6b8795880eda9dd40e0c3294f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07a13371ab7d13f02ec4098ff647ea1fab33961ef1ee00324fdda7c42b845aab9884b93694e7097e9c5f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe329f2ab7ba9c92c1399d1b721609a0f7f7a038532e6ca3fae5486953d03bc3",
+        "lastblockhash" : "0x35c256f75f1afd7862a68940be13ef7a91605981cc13f68cd8aed3ef52998441",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d105g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb3f743837f394b9f1f451ec21f1e30e98fc324465102ee4cf3829e55562e498b",
-                    "mixHash" : "0x6c3a2d658c87c50707b4e737feae1d49700039506b68bf01922994e78f2ce372",
-                    "nonce" : "0x27e37e897b25e4d6",
+                    "hash" : "0x94881c8aa4025f27d2cbc1ed18938d5e61a8fa760579f0ad3af66441954d10ea",
+                    "mixHash" : "0xe1abc1e7a3d7c03ab4012d6a7f496909b77b6d6aa8fd467e7eb9e04c33bbcd88",
+                    "nonce" : "0x51120a8c6fc5bbc0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06c3a2d658c87c50707b4e737feae1d49700039506b68bf01922994e78f2ce3728827e37e897b25e4d6f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e1abc1e7a3d7c03ab4012d6a7f496909b77b6d6aa8fd467e7eb9e04c33bbcd888851120a8c6fc5bbc0f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3f743837f394b9f1f451ec21f1e30e98fc324465102ee4cf3829e55562e498b",
+        "lastblockhash" : "0x94881c8aa4025f27d2cbc1ed18938d5e61a8fa760579f0ad3af66441954d10ea",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d105g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9650904a6f97bf6b96153f99e64a1424fe638071c0ae361746a28e8b7f98bdde",
-                    "mixHash" : "0xd26fd46c287018be2d6366a7de27025390ef58d6a1f267c6497afe2c31d4e00b",
-                    "nonce" : "0xc9d0af19afa4b89a",
+                    "hash" : "0x58b17fe6b66e271eafd17244a31b27dbb15a554135d239507c5b7b72cab2fb94",
+                    "mixHash" : "0x2b6a059d9157fbcfe8f07033e9f57a14e64e292875f20c246311ead2d6a6962c",
+                    "nonce" : "0xfe10fa359bc2da9a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d26fd46c287018be2d6366a7de27025390ef58d6a1f267c6497afe2c31d4e00b88c9d0af19afa4b89af85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b6a059d9157fbcfe8f07033e9f57a14e64e292875f20c246311ead2d6a6962c88fe10fa359bc2da9af85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9650904a6f97bf6b96153f99e64a1424fe638071c0ae361746a28e8b7f98bdde",
+        "lastblockhash" : "0x58b17fe6b66e271eafd17244a31b27dbb15a554135d239507c5b7b72cab2fb94",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d105g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3468323f4eceabb2257e2a857969020ab8982f2f22790a9c1b506ffe2b6f8ce9",
-                    "mixHash" : "0x66531b542bf23053880482bf1a5d618172e407d131a13413b0ea5fc957180a17",
-                    "nonce" : "0x30774eb6cb455bad",
+                    "hash" : "0xfd5c01978ff3a437fadbe518e45baee294f2ea83b5917e13f0e1d58e703568d7",
+                    "mixHash" : "0x4236e9451ff857ce107b0767d83d763adfe6902129ae88c4f4a39348fc685002",
+                    "nonce" : "0xefc03a3707132d29",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a066531b542bf23053880482bf1a5d618172e407d131a13413b0ea5fc957180a178830774eb6cb455badf85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04236e9451ff857ce107b0767d83d763adfe6902129ae88c4f4a39348fc68500288efc03a3707132d29f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3468323f4eceabb2257e2a857969020ab8982f2f22790a9c1b506ffe2b6f8ce9",
+        "lastblockhash" : "0xfd5c01978ff3a437fadbe518e45baee294f2ea83b5917e13f0e1d58e703568d7",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d105g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d105g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x582c00209e38d04ee63180143210c4fe4b17a2c0cb45ec9f1c06e5699adaafe6",
-                    "mixHash" : "0x95ba1119872779b72429c0de57993a4258bc7ea4ab6d25613cf3e813be6eb1e7",
-                    "nonce" : "0xf98bb5a269441a82",
+                    "hash" : "0x40c25188d2c798005562d85f2d43abaff747c2b9224fe37f15d2c44bfbfe5b17",
+                    "mixHash" : "0x947fa12608993d4d9cf46e95503be5360c76be63900bca1a036c365ed7e63cf6",
+                    "nonce" : "0xaf8e40e0f3fbbfc7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x15cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a095ba1119872779b72429c0de57993a4258bc7ea4ab6d25613cf3e813be6eb1e788f98bb5a269441a82f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea015cf6f10ffe62ffa98def031b166d505137ade5f2b6d2a4bc6f42fc8111ebab8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0947fa12608993d4d9cf46e95503be5360c76be63900bca1a036c365ed7e63cf688af8e40e0f3fbbfc7f85ff85d800183061a8080830186a08e6001600160016001e660006000f31ba075d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700ba0248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x582c00209e38d04ee63180143210c4fe4b17a2c0cb45ec9f1c06e5699adaafe6",
+        "lastblockhash" : "0x40c25188d2c798005562d85f2d43abaff747c2b9224fe37f15d2c44bfbfe5b17",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0.json
index 984b8e880..8af96e892 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d106g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x453ce0e9bff2255c30b2db24e89179801f3bf5637afbde80a15a9fb880cacd76",
-                    "mixHash" : "0x1d88b786808e233ccd214fdd1d92e7008d8fdb335fdd8e409abf49e055bb0c1f",
-                    "nonce" : "0xaf6f2703a8ebe5e0",
+                    "hash" : "0x1aa5d2cfe32fe64d6cd0ad02e455e8cac5be5d5e2b54a3ed9f212cbc3c722f19",
+                    "mixHash" : "0x5c8c98cb8739d538602ee8e04f85d657febb7a9ce2b276f24db9674e2ec7dca9",
+                    "nonce" : "0xda61655f13f8d47d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d88b786808e233ccd214fdd1d92e7008d8fdb335fdd8e409abf49e055bb0c1f88af6f2703a8ebe5e0f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05c8c98cb8739d538602ee8e04f85d657febb7a9ce2b276f24db9674e2ec7dca988da61655f13f8d47df85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x453ce0e9bff2255c30b2db24e89179801f3bf5637afbde80a15a9fb880cacd76",
+        "lastblockhash" : "0x1aa5d2cfe32fe64d6cd0ad02e455e8cac5be5d5e2b54a3ed9f212cbc3c722f19",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d106g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcc90ee99979550c1ec36558dcc949d13174afb5956ffb191fa695af44b195c2d",
-                    "mixHash" : "0x73d6f207b910352eb46871753f72eb8b7ceb6a717252c938dc106c34e3e7ea3f",
-                    "nonce" : "0x67d5d3fb258e6902",
+                    "hash" : "0x9cc52477b032c041ab69225c53b493f2fb9d1e6ade4448114682cd2c4ae2ad20",
+                    "mixHash" : "0x95bf4f846dd48c9f6b65a42937db9ba49b19038583fc94a3c632b5782f882286",
+                    "nonce" : "0xc9efe88993b2a1d2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a073d6f207b910352eb46871753f72eb8b7ceb6a717252c938dc106c34e3e7ea3f8867d5d3fb258e6902f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a095bf4f846dd48c9f6b65a42937db9ba49b19038583fc94a3c632b5782f88228688c9efe88993b2a1d2f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc90ee99979550c1ec36558dcc949d13174afb5956ffb191fa695af44b195c2d",
+        "lastblockhash" : "0x9cc52477b032c041ab69225c53b493f2fb9d1e6ade4448114682cd2c4ae2ad20",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d106g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa526a64b4e772e156bda69e9ce65f5f3404adb2bd426ed721c4116412fecd8db",
-                    "mixHash" : "0x127ce7df8caf1abf05760ab7bd260479017cec9f4fff64b6deea108d8081ad96",
-                    "nonce" : "0x2580eb326b72e897",
+                    "hash" : "0x8ad3d4f33a8ecf8288d121536cc40d9e2ec597ff270dc1e8468a22cd4f9f43ab",
+                    "mixHash" : "0xf92483d9ec533a128b0fe32640abe90950889d2c01921309c83efc4b3f24dda7",
+                    "nonce" : "0xa4476f59655ac5b1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0127ce7df8caf1abf05760ab7bd260479017cec9f4fff64b6deea108d8081ad96882580eb326b72e897f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f92483d9ec533a128b0fe32640abe90950889d2c01921309c83efc4b3f24dda788a4476f59655ac5b1f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa526a64b4e772e156bda69e9ce65f5f3404adb2bd426ed721c4116412fecd8db",
+        "lastblockhash" : "0x8ad3d4f33a8ecf8288d121536cc40d9e2ec597ff270dc1e8468a22cd4f9f43ab",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d106g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdfb351579888349b6884f219cfd9729f8e95d2df1a568786621250fa780f70f2",
-                    "mixHash" : "0x4e122fce62545c87c4f1b4c89b39ef16711fe769ac2237c38686b71603200cd1",
-                    "nonce" : "0xcf9725f2f4813f0d",
+                    "hash" : "0x45635042539077cd677588c6cf43f73e952c011bbd7b58ee0be4c4d1f04fe86f",
+                    "mixHash" : "0xff921ec25a6b8be2cad3310298bbfbc2257d046b9fe9f207ee76261ba7cc639a",
+                    "nonce" : "0xbe9f3aa990a04023",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e122fce62545c87c4f1b4c89b39ef16711fe769ac2237c38686b71603200cd188cf9725f2f4813f0df85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ff921ec25a6b8be2cad3310298bbfbc2257d046b9fe9f207ee76261ba7cc639a88be9f3aa990a04023f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfb351579888349b6884f219cfd9729f8e95d2df1a568786621250fa780f70f2",
+        "lastblockhash" : "0x45635042539077cd677588c6cf43f73e952c011bbd7b58ee0be4c4d1f04fe86f",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d106g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc03c984d65841942bd62f56e1a6172147c113439499e3d407da341cf6e86f110",
-                    "mixHash" : "0x3b46571121d345968e43b82afb73fd6fc2b54307eb74f87336ab72207c01fb3d",
-                    "nonce" : "0x4162a3f0e5db34d1",
+                    "hash" : "0x864fe2184db2e62402a737739fa41f31c88010cbccf5871dca4e3e2c3cf18554",
+                    "mixHash" : "0x45840b3e720313b6051cf5df2d02793f0d19855123d60c022ea584fe9494ce69",
+                    "nonce" : "0xfc4361360351237f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b46571121d345968e43b82afb73fd6fc2b54307eb74f87336ab72207c01fb3d884162a3f0e5db34d1f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a045840b3e720313b6051cf5df2d02793f0d19855123d60c022ea584fe9494ce6988fc4361360351237ff85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc03c984d65841942bd62f56e1a6172147c113439499e3d407da341cf6e86f110",
+        "lastblockhash" : "0x864fe2184db2e62402a737739fa41f31c88010cbccf5871dca4e3e2c3cf18554",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d106g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d106g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6e974563e6478f5d7b25a8b193472f2bc574f9d314953647ae58a8df1754afe7",
-                    "mixHash" : "0x61255f2ffd7154bebe5c2cbdb03ea2d4c3e4df5ffa1f4b46e38f4d27cda83711",
-                    "nonce" : "0x2bdea647caac9243",
+                    "hash" : "0xdba1980842ad30023cc0a7c3ab2a46ad8a8f8f6451d3d81909e2d80e47323671",
+                    "mixHash" : "0xfe76fc44512f5518536902d1ec4c6133d63f9d2545e79d3c3d77676dd52b88da",
+                    "nonce" : "0xce2bee5ab019b7e1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a061255f2ffd7154bebe5c2cbdb03ea2d4c3e4df5ffa1f4b46e38f4d27cda83711882bdea647caac9243f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b19628873960bfc52d1e2408dccfb3d540fca5ecc683cbe09d2155fc250f7c41a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fe76fc44512f5518536902d1ec4c6133d63f9d2545e79d3c3d77676dd52b88da88ce2bee5ab019b7e1f85ff85d800183061a8080830186a08e6001600160016001e760006000f31ba0f587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4ea017b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598cec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e974563e6478f5d7b25a8b193472f2bc574f9d314953647ae58a8df1754afe7",
+        "lastblockhash" : "0xdba1980842ad30023cc0a7c3ab2a46ad8a8f8f6451d3d81909e2d80e47323671",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0.json
index 7ffa2a728..bcd64416e 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d107g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9efaa7d1e5802c2c7e72e6c7cce5b9d01e6279eb2ca2020881965b07e031f949",
-                    "mixHash" : "0xba9f9905df76c685729547597d5eabf8c5459bd69c678ba4e366fe9b70fc4cb3",
-                    "nonce" : "0x8ccab8a4ff772db2",
+                    "hash" : "0x7cb394fa594650a32c19e81ca253c3e4b83617358d13685f1b641201f912cba0",
+                    "mixHash" : "0x71e0bc7955dec704fbac4d0a9b85deb60e54013c6b8dd4f8d3c5159ac41b41a3",
+                    "nonce" : "0xbd546fe73fdf980b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ba9f9905df76c685729547597d5eabf8c5459bd69c678ba4e366fe9b70fc4cb3888ccab8a4ff772db2f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a071e0bc7955dec704fbac4d0a9b85deb60e54013c6b8dd4f8d3c5159ac41b41a388bd546fe73fdf980bf85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9efaa7d1e5802c2c7e72e6c7cce5b9d01e6279eb2ca2020881965b07e031f949",
+        "lastblockhash" : "0x7cb394fa594650a32c19e81ca253c3e4b83617358d13685f1b641201f912cba0",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d107g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x15ae83f5987a03bb3e3a8aaf691d16323e08515ba69111c759fdd7884c72ecc1",
-                    "mixHash" : "0x9fdcb91829d23da3fdb38a238460bed420570ff08c97df7713aaa07276e9be25",
-                    "nonce" : "0xc3e725727e0140f2",
+                    "hash" : "0x34e95de06f77b08a95ef9cfce607d3fd7f74202389a92aae202585e1d5a76549",
+                    "mixHash" : "0x6ec61a1b86a4e894e915131d3173a54bb51977204d23b7093ab87f61c51e6487",
+                    "nonce" : "0x2213f9b365e50a62",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09fdcb91829d23da3fdb38a238460bed420570ff08c97df7713aaa07276e9be2588c3e725727e0140f2f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ec61a1b86a4e894e915131d3173a54bb51977204d23b7093ab87f61c51e6487882213f9b365e50a62f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15ae83f5987a03bb3e3a8aaf691d16323e08515ba69111c759fdd7884c72ecc1",
+        "lastblockhash" : "0x34e95de06f77b08a95ef9cfce607d3fd7f74202389a92aae202585e1d5a76549",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d107g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x80b793a32224c5aa271ab807cf3ffa7b4bd75467d83728bcf7d88862568d93b9",
-                    "mixHash" : "0x2e6db2d770220f624c75af2eb51294fa9c46fb49e9dcaa3a511e3510aa627454",
-                    "nonce" : "0xedd77242f98213e4",
+                    "hash" : "0x6be2184475751794915501c3d2345cd0b97fd88214cec1e63d696e260519f18a",
+                    "mixHash" : "0x615fb458caa94fb3241d0f6acbabe2d8490faf6643a562840c4d3c1b5d5a6201",
+                    "nonce" : "0xe6c3600f3a0081b1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02e6db2d770220f624c75af2eb51294fa9c46fb49e9dcaa3a511e3510aa62745488edd77242f98213e4f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0615fb458caa94fb3241d0f6acbabe2d8490faf6643a562840c4d3c1b5d5a620188e6c3600f3a0081b1f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80b793a32224c5aa271ab807cf3ffa7b4bd75467d83728bcf7d88862568d93b9",
+        "lastblockhash" : "0x6be2184475751794915501c3d2345cd0b97fd88214cec1e63d696e260519f18a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d107g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4bb4946e8c60f2261587c9e7758df77a39cde59f39ce0f129dcb664224ebd925",
-                    "mixHash" : "0x2c1c0247625630d838206ecb8270b3f2c9e192f9724444a1a3e0f4679e8bbdc8",
-                    "nonce" : "0x0ef4d275a7dd53d1",
+                    "hash" : "0x2b551126d973120414223280099ebbed07974458e7691b7576767bc4f16600f5",
+                    "mixHash" : "0x53e6d72b03e8d0592948af0964a6e898c489d5fcccf6e3582c7f698ebd2103b8",
+                    "nonce" : "0x6d7233d6d01f3c76",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c1c0247625630d838206ecb8270b3f2c9e192f9724444a1a3e0f4679e8bbdc8880ef4d275a7dd53d1f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a053e6d72b03e8d0592948af0964a6e898c489d5fcccf6e3582c7f698ebd2103b8886d7233d6d01f3c76f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4bb4946e8c60f2261587c9e7758df77a39cde59f39ce0f129dcb664224ebd925",
+        "lastblockhash" : "0x2b551126d973120414223280099ebbed07974458e7691b7576767bc4f16600f5",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d107g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0cee7c39c06a48c177561549615b41047c82807da5deb0c2d4cabd1ffeed10f3",
-                    "mixHash" : "0x9b1dc4c2758a4f39a9ccaf7689c8db7f14736d049dd24c12c231536da97e33d0",
-                    "nonce" : "0x1b5543fbebb24be1",
+                    "hash" : "0x3695f99e83a2f000df80fae8ebc4b34cbc3ff28ecac0ee7bc3c40f8cb89eb085",
+                    "mixHash" : "0xfefa3e8933107a20415c3ffbc04d0a393f9b6c96827d7d907f3a29247691f7ba",
+                    "nonce" : "0xe932a79c11aea877",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09b1dc4c2758a4f39a9ccaf7689c8db7f14736d049dd24c12c231536da97e33d0881b5543fbebb24be1f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fefa3e8933107a20415c3ffbc04d0a393f9b6c96827d7d907f3a29247691f7ba88e932a79c11aea877f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0cee7c39c06a48c177561549615b41047c82807da5deb0c2d4cabd1ffeed10f3",
+        "lastblockhash" : "0x3695f99e83a2f000df80fae8ebc4b34cbc3ff28ecac0ee7bc3c40f8cb89eb085",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d107g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d107g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xed2e294a30d2e7bae5dde41109c261fa66b2d6c1081f2385abe8ddd2228b61f9",
-                    "mixHash" : "0xb06b7016089474db0840a0c4409c862df9d4656e5fb069c3b194cb4f76afd274",
-                    "nonce" : "0x59c5084a95c309dc",
+                    "hash" : "0x9646fc28fe77793b248ab19e1bcaa59346dde666555419402d09bbe5d2b29edc",
+                    "mixHash" : "0x2ee5df86fe15170040352990440aad90b3fa447fa07fc1788f98f0da7de55c85",
+                    "nonce" : "0x6ebbf49e034a2cf9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x48738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b06b7016089474db0840a0c4409c862df9d4656e5fb069c3b194cb4f76afd2748859c5084a95c309dcf85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea048738cb130e05f621d30705c5905a1d10f8c823abe9a131e10ba7d94622b3d3ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ee5df86fe15170040352990440aad90b3fa447fa07fc1788f98f0da7de55c85886ebbf49e034a2cf9f85ff85d800183061a8080830186a08e6001600160016001e860006000f31ca0ff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2a036ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed2e294a30d2e7bae5dde41109c261fa66b2d6c1081f2385abe8ddd2228b61f9",
+        "lastblockhash" : "0x9646fc28fe77793b248ab19e1bcaa59346dde666555419402d09bbe5d2b29edc",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0.json
index 3b6845e7b..cbb702967 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d108g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7d0e4a856a41400a70d958a731c2f04fcbe17e5c9d010b762bea7dcda9a29fbb",
-                    "mixHash" : "0xc919991461c7a988b5c692b81bd382d6c55c218939bf0ec8e1af01b75eaeea2b",
-                    "nonce" : "0xec7dd28f1dd4e747",
+                    "hash" : "0x75eb4f463f0d83bd5d98ea20ec68cefc6b3d76170440a14162d8da410ddf4116",
+                    "mixHash" : "0x7fc873659b400fccaecc3d4446c8f84d51f520a74f9ad6717e70957bafb3f721",
+                    "nonce" : "0x55f151f7f7cbd3c8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c919991461c7a988b5c692b81bd382d6c55c218939bf0ec8e1af01b75eaeea2b88ec7dd28f1dd4e747f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07fc873659b400fccaecc3d4446c8f84d51f520a74f9ad6717e70957bafb3f7218855f151f7f7cbd3c8f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d0e4a856a41400a70d958a731c2f04fcbe17e5c9d010b762bea7dcda9a29fbb",
+        "lastblockhash" : "0x75eb4f463f0d83bd5d98ea20ec68cefc6b3d76170440a14162d8da410ddf4116",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d108g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1b1e88e24a414aba35d0dcb4627f6e85c2cfade81958e96b2418cd63f6b19c1b",
-                    "mixHash" : "0x1c944d58b5205d6ebaee374b9a47e14b7813648a49ea590fc5b4f4f733236a7f",
-                    "nonce" : "0x758ddb130b40845e",
+                    "hash" : "0xb0ac3fad241b6ffc77f98952ee8d33a0e79f9381fd7dffbc978749356c9b952d",
+                    "mixHash" : "0xf8ebb8550d72ae3ea720019ecfb261f37762bd38fccde9860e0e0d343836db48",
+                    "nonce" : "0x228bd80ecd1763dd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01c944d58b5205d6ebaee374b9a47e14b7813648a49ea590fc5b4f4f733236a7f88758ddb130b40845ef85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f8ebb8550d72ae3ea720019ecfb261f37762bd38fccde9860e0e0d343836db4888228bd80ecd1763ddf85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b1e88e24a414aba35d0dcb4627f6e85c2cfade81958e96b2418cd63f6b19c1b",
+        "lastblockhash" : "0xb0ac3fad241b6ffc77f98952ee8d33a0e79f9381fd7dffbc978749356c9b952d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d108g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcc48d37a2a9e8b64cc8daddc2d445c4df6ec348dacff1be70da2ed595937dc24",
-                    "mixHash" : "0x6f393dcfecb0ec4389f4790f553fae5f8206bd898f410ac93d2ebebcaada58ad",
-                    "nonce" : "0x5b6edb736938fea8",
+                    "hash" : "0xc7dc325048a7c3115f9c33cb08625b6f3342552764826da737250385ce1f82d6",
+                    "mixHash" : "0xc285b4f26ddcf51844cc5c9eaef1632efa92ff40c868605f6a623710dbd00e0c",
+                    "nonce" : "0xf1bcf5e2e61290e1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06f393dcfecb0ec4389f4790f553fae5f8206bd898f410ac93d2ebebcaada58ad885b6edb736938fea8f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c285b4f26ddcf51844cc5c9eaef1632efa92ff40c868605f6a623710dbd00e0c88f1bcf5e2e61290e1f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc48d37a2a9e8b64cc8daddc2d445c4df6ec348dacff1be70da2ed595937dc24",
+        "lastblockhash" : "0xc7dc325048a7c3115f9c33cb08625b6f3342552764826da737250385ce1f82d6",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d108g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8fc214f04c3a890b3e1bdc603ea3d62ba638fe8b44383d6feba5f42647b141fb",
-                    "mixHash" : "0x9febe2a9cec4a16a24125eba69da6dd5297092385a3c1032ac49b84f5397e04f",
-                    "nonce" : "0xe935920ec88a5e5c",
+                    "hash" : "0x4c53b217c1f980aa6ef0251fdb5638867932963e982e273f9f5dab629a758588",
+                    "mixHash" : "0x31f4436df9edbffca3cef5af6d17518d3484c66765383a3f8f7f52b2fb37b531",
+                    "nonce" : "0xb08b7cfed8bc782e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09febe2a9cec4a16a24125eba69da6dd5297092385a3c1032ac49b84f5397e04f88e935920ec88a5e5cf85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a031f4436df9edbffca3cef5af6d17518d3484c66765383a3f8f7f52b2fb37b53188b08b7cfed8bc782ef85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8fc214f04c3a890b3e1bdc603ea3d62ba638fe8b44383d6feba5f42647b141fb",
+        "lastblockhash" : "0x4c53b217c1f980aa6ef0251fdb5638867932963e982e273f9f5dab629a758588",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d108g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x725d6c996e3817c3a29ce1466a0dd30a78361fd0b820b1bcc311d036da622ae4",
-                    "mixHash" : "0x3bb1c5987dc34b697d9e36d429c8b421104b8ef4f54653a35554dd5e81cf9515",
-                    "nonce" : "0xe9d02bd198757b68",
+                    "hash" : "0xa83e11f400f3e122b22582bc4fbeef1ebf7fc8397a8575cfb720715dba973f40",
+                    "mixHash" : "0x112580107b1e93959aebfbe38e30680e7f7ff6e37a59be2bf8ebcdfb63afa352",
+                    "nonce" : "0x4711f12e967c0933",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03bb1c5987dc34b697d9e36d429c8b421104b8ef4f54653a35554dd5e81cf951588e9d02bd198757b68f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0112580107b1e93959aebfbe38e30680e7f7ff6e37a59be2bf8ebcdfb63afa352884711f12e967c0933f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x725d6c996e3817c3a29ce1466a0dd30a78361fd0b820b1bcc311d036da622ae4",
+        "lastblockhash" : "0xa83e11f400f3e122b22582bc4fbeef1ebf7fc8397a8575cfb720715dba973f40",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d108g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d108g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa866bc3d57727ceae5f1184ee896e05bd30a7dc0b9757bdfe137ff77c75fb494",
-                    "mixHash" : "0x868acad3a385a25113b19b9636073d2a2e479ab50c6e733036a54f68549f4ede",
-                    "nonce" : "0xe160a03cbf5a0fe7",
+                    "hash" : "0xe3ba5848162f264f345a3344b9c2b06566ac962e4a1deab31b14aadf57b372e2",
+                    "mixHash" : "0x1b44533f03ee19644ba2ef79b82a9acffb8f4ae3af7e1575f097297abd1b04d2",
+                    "nonce" : "0x81d8cf0e39e37415",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x14e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0868acad3a385a25113b19b9636073d2a2e479ab50c6e733036a54f68549f4ede88e160a03cbf5a0fe7f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea014e84a8270ae688d0b6d42f0c0db959fe172f4dbe48b9e44e9b4c3cdad6fd179a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01b44533f03ee19644ba2ef79b82a9acffb8f4ae3af7e1575f097297abd1b04d28881d8cf0e39e37415f85ff85d800183061a8080830186a08e6001600160016001e960006000f31ba0b72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554a052183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa866bc3d57727ceae5f1184ee896e05bd30a7dc0b9757bdfe137ff77c75fb494",
+        "lastblockhash" : "0xe3ba5848162f264f345a3344b9c2b06566ac962e4a1deab31b14aadf57b372e2",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0.json
index bc5a5fa6b..f443f16b3 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d109g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa067c93fc70edb35b3accd7fd0017c2127cde5c9410767f6f0d4e7ec6d72478e",
-                    "mixHash" : "0x8ba37c6d82cec92c12eab7472b27ed37d83b0aa3f0506522c1745ef78e2309c1",
-                    "nonce" : "0xaa23a3cb6c2f300c",
+                    "hash" : "0x064f17270e692b06035a7ac92359a4dd61847d1e351ad41ad2798d014d3adfba",
+                    "mixHash" : "0x02ea069538c946cc6b4e452b8aa0ba107bd9bf38a52bf9b78b34039220b7cf5c",
+                    "nonce" : "0xe9403f56261f5d21",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08ba37c6d82cec92c12eab7472b27ed37d83b0aa3f0506522c1745ef78e2309c188aa23a3cb6c2f300cf85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002ea069538c946cc6b4e452b8aa0ba107bd9bf38a52bf9b78b34039220b7cf5c88e9403f56261f5d21f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa067c93fc70edb35b3accd7fd0017c2127cde5c9410767f6f0d4e7ec6d72478e",
+        "lastblockhash" : "0x064f17270e692b06035a7ac92359a4dd61847d1e351ad41ad2798d014d3adfba",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d109g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe360f1ca0cb6cd24e9a88edfdd03d62bce996092c8b2a5464d6023fd0c7388e3",
-                    "mixHash" : "0xab6d311c86dc3e39066bed32169cbe9e34537ee8e10982edfe60a8b892cefaaf",
-                    "nonce" : "0x9a862bc2d47957d3",
+                    "hash" : "0x14c6d960e798940f39aced554f27f4f954cefe553758e3cdaf7e7fdad208b6d4",
+                    "mixHash" : "0xb63f2f67ac13c77c5d4b7ecec3b20fb4527ad9749f14a8744189be858989a80d",
+                    "nonce" : "0xb55a42162a780d50",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab6d311c86dc3e39066bed32169cbe9e34537ee8e10982edfe60a8b892cefaaf889a862bc2d47957d3f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b63f2f67ac13c77c5d4b7ecec3b20fb4527ad9749f14a8744189be858989a80d88b55a42162a780d50f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe360f1ca0cb6cd24e9a88edfdd03d62bce996092c8b2a5464d6023fd0c7388e3",
+        "lastblockhash" : "0x14c6d960e798940f39aced554f27f4f954cefe553758e3cdaf7e7fdad208b6d4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d109g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4a1987de45d8cdbf49b0861f057d769765e6cd1d28334e86f5b50879f39e82c9",
-                    "mixHash" : "0x5342908a712407e4feaaa0e76f3c61ef94dd1aa58b90a6f30ebcb6b918bbecde",
-                    "nonce" : "0xeb1ffd86bad49322",
+                    "hash" : "0xce6afcdae1f2728bc47cac6572778cc5358ea5040ef86d20730614fca10834a2",
+                    "mixHash" : "0xf0a0394245a067faecd23df401c936daafec27ade3df106dab7ddb7c8d265300",
+                    "nonce" : "0x7f5d8c00f154027b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05342908a712407e4feaaa0e76f3c61ef94dd1aa58b90a6f30ebcb6b918bbecde88eb1ffd86bad49322f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f0a0394245a067faecd23df401c936daafec27ade3df106dab7ddb7c8d265300887f5d8c00f154027bf85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a1987de45d8cdbf49b0861f057d769765e6cd1d28334e86f5b50879f39e82c9",
+        "lastblockhash" : "0xce6afcdae1f2728bc47cac6572778cc5358ea5040ef86d20730614fca10834a2",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d109g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x24718bfd8d0be933c2a0a320dc20fcb4ae52f55adc2c55f99f8a7f824707f11a",
-                    "mixHash" : "0xdb2d5551b8469c815a8bef27d54fd9b28f15341605e73c9edb69aba3c8bbb838",
-                    "nonce" : "0x4fd28606c92ee523",
+                    "hash" : "0xf094113823cca0bc1a03276ea0a569b0398ef1f9d08a10df276a80ab2cd2f574",
+                    "mixHash" : "0x4b929cd3e410ea155dd3d828c9c48dedfe5f8d8baf12e8430e7bc49b2ef6d1d5",
+                    "nonce" : "0xab45baa2d7abca2e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0db2d5551b8469c815a8bef27d54fd9b28f15341605e73c9edb69aba3c8bbb838884fd28606c92ee523f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04b929cd3e410ea155dd3d828c9c48dedfe5f8d8baf12e8430e7bc49b2ef6d1d588ab45baa2d7abca2ef85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24718bfd8d0be933c2a0a320dc20fcb4ae52f55adc2c55f99f8a7f824707f11a",
+        "lastblockhash" : "0xf094113823cca0bc1a03276ea0a569b0398ef1f9d08a10df276a80ab2cd2f574",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d109g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb72cd77925202696c3b250dd337a4af138f78dee1fec09dd295c26c46b8ff458",
-                    "mixHash" : "0xf5023b9c06428504d9faccc4bf0309b194ebac09d9cd49613de29939c519a414",
-                    "nonce" : "0x6da7e3193e2ad3cb",
+                    "hash" : "0x0c24344a6c36586d987caa0d68c350b35dcd24809e83cea56467b02581ac7b7e",
+                    "mixHash" : "0x33c02a1c410e919651b140c4f93be2d3fe5219a657b3fe03328301bfc173ed17",
+                    "nonce" : "0x7d8e1c28d182565b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f5023b9c06428504d9faccc4bf0309b194ebac09d9cd49613de29939c519a414886da7e3193e2ad3cbf85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a033c02a1c410e919651b140c4f93be2d3fe5219a657b3fe03328301bfc173ed17887d8e1c28d182565bf85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb72cd77925202696c3b250dd337a4af138f78dee1fec09dd295c26c46b8ff458",
+        "lastblockhash" : "0x0c24344a6c36586d987caa0d68c350b35dcd24809e83cea56467b02581ac7b7e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d109g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d109g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2bd946faf5be75fa15162926435486077c37227939f6653721e09438944add5c",
-                    "mixHash" : "0x91278380017332fe26a736525698106a55b9b1e7e80793dc19871b04f59b09e7",
-                    "nonce" : "0x46c467da161dea60",
+                    "hash" : "0xce23944c053b2b1056298798555e9b0fa2fb1ae7ed9b2f5bef5c8b4fd2022d0b",
+                    "mixHash" : "0x096cb958830627e461dca566dc3a0a94ee299b8521fc7761737686c4616423fb",
+                    "nonce" : "0x0a579c297ea61e84",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xd8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091278380017332fe26a736525698106a55b9b1e7e80793dc19871b04f59b09e78846c467da161dea60f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d8f23cacb08b33fce1a2f1cacee29f56d438301dbe036abbb8c9d07f36a2862ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0096cb958830627e461dca566dc3a0a94ee299b8521fc7761737686c4616423fb880a579c297ea61e84f85ff85d800183061a8080830186a08e6001600160016001ea60006000f31ba0406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450a0458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ea60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bd946faf5be75fa15162926435486077c37227939f6653721e09438944add5c",
+        "lastblockhash" : "0xce23944c053b2b1056298798555e9b0fa2fb1ae7ed9b2f5bef5c8b4fd2022d0b",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0.json
index d49007492..f386bf022 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d10g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8a329c86de6db0328e7fe1cf3c537eb22587e3dcd4dd35fadcbcf579837de175",
-                    "mixHash" : "0x7a62325141ddfbfe2ada180342462e1b6beb5ecc245f4131c1e2883f9916fba3",
-                    "nonce" : "0x80889350b21e586d",
+                    "hash" : "0x9c3d880527dd7739be11c845442484574e052ee24d49ee059f90ebee5e21f78b",
+                    "mixHash" : "0xc70e7dd68ead4405f5e917f4238fd476dd08a8851f32f860e91083f7c6266e21",
+                    "nonce" : "0x7156ff23e709ba5b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07a62325141ddfbfe2ada180342462e1b6beb5ecc245f4131c1e2883f9916fba38880889350b21e586df85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c70e7dd68ead4405f5e917f4238fd476dd08a8851f32f860e91083f7c6266e21887156ff23e709ba5bf85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a329c86de6db0328e7fe1cf3c537eb22587e3dcd4dd35fadcbcf579837de175",
+        "lastblockhash" : "0x9c3d880527dd7739be11c845442484574e052ee24d49ee059f90ebee5e21f78b",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d10g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5038ac1d15011ab7d9776490da82dff88e4e930bb95e799e03feb3ebc220a645",
-                    "mixHash" : "0x4849caffa836780e0f4e6e72fd5c6ba50d226b5da221ba61c849b38ca50d57be",
-                    "nonce" : "0xef5810acce1f463f",
+                    "hash" : "0x1d5ae7690d7ceaf1adcdbcd9011bfb3e8a8da7921f33615487bd18e9d8ca97c6",
+                    "mixHash" : "0x2bb12caa406485cf4867ce75f47c895fbf6f4f7f74aecfe962c3faf17a481c98",
+                    "nonce" : "0xb8e092773531df63",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04849caffa836780e0f4e6e72fd5c6ba50d226b5da221ba61c849b38ca50d57be88ef5810acce1f463ff85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02bb12caa406485cf4867ce75f47c895fbf6f4f7f74aecfe962c3faf17a481c9888b8e092773531df63f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5038ac1d15011ab7d9776490da82dff88e4e930bb95e799e03feb3ebc220a645",
+        "lastblockhash" : "0x1d5ae7690d7ceaf1adcdbcd9011bfb3e8a8da7921f33615487bd18e9d8ca97c6",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d10g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0efb502200e40aecf357983c43c7ccb1c4afe77b8136e38a2dc2c8861593f3ed",
-                    "mixHash" : "0x69f7b65846c58e26fdce329dce54ba812c410c64e1888b7b6f61f07ebcbf8e3c",
-                    "nonce" : "0x819d2ef6e980fddf",
+                    "hash" : "0xcf8f7f0cd3c85f934ec990061b444292f94acdb6e4e9dc6a72f0868c53492700",
+                    "mixHash" : "0x45d94f947d299c4ae380d1411200601b4b68d2539a7d8c6356a8215962243723",
+                    "nonce" : "0x674b64e5ff9df23e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a069f7b65846c58e26fdce329dce54ba812c410c64e1888b7b6f61f07ebcbf8e3c88819d2ef6e980fddff85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a045d94f947d299c4ae380d1411200601b4b68d2539a7d8c6356a821596224372388674b64e5ff9df23ef85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0efb502200e40aecf357983c43c7ccb1c4afe77b8136e38a2dc2c8861593f3ed",
+        "lastblockhash" : "0xcf8f7f0cd3c85f934ec990061b444292f94acdb6e4e9dc6a72f0868c53492700",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d10g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x33eec3c172022b5ebb50a42cfa1020d2b32b5538cb522e2c84ad7f8110064ad1",
-                    "mixHash" : "0x57572a830df0b10eab172cd09e757ca55c6627cbf9ac1440fca6057347a7921c",
-                    "nonce" : "0x464adef5c3ac592d",
+                    "hash" : "0x67fb4f6008f4787c756e847a4876cf6e8bfa3dbfa1212ef9e03e4ebe61104466",
+                    "mixHash" : "0x1d9bd960c0f92fd8c67c2871fb33b130ce3b6037a508ade6b80a719933d5c9ef",
+                    "nonce" : "0x7ed5fe8e89e59a05",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057572a830df0b10eab172cd09e757ca55c6627cbf9ac1440fca6057347a7921c88464adef5c3ac592df85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d9bd960c0f92fd8c67c2871fb33b130ce3b6037a508ade6b80a719933d5c9ef887ed5fe8e89e59a05f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33eec3c172022b5ebb50a42cfa1020d2b32b5538cb522e2c84ad7f8110064ad1",
+        "lastblockhash" : "0x67fb4f6008f4787c756e847a4876cf6e8bfa3dbfa1212ef9e03e4ebe61104466",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d10g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5a2c224007f42987caf3e5b3d5884911c74829bece066a5258c6099e35353edc",
-                    "mixHash" : "0x43f890f3bfd8947c50a61f96464e4f058def580ead2f99cb757316d69a7c3fcb",
-                    "nonce" : "0xcd216a3e9b068961",
+                    "hash" : "0xd86baa778423e989f042a9a9ceaf9b561f705374fb197ec5fe0b19eb428a705f",
+                    "mixHash" : "0xbdfe4ef1be09b8b5139eba8ca48f0cca1133c2f1456b2e13e73f4af9a9914c4f",
+                    "nonce" : "0xc34ce4bc8a69aa52",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043f890f3bfd8947c50a61f96464e4f058def580ead2f99cb757316d69a7c3fcb88cd216a3e9b068961f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bdfe4ef1be09b8b5139eba8ca48f0cca1133c2f1456b2e13e73f4af9a9914c4f88c34ce4bc8a69aa52f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a2c224007f42987caf3e5b3d5884911c74829bece066a5258c6099e35353edc",
+        "lastblockhash" : "0xd86baa778423e989f042a9a9ceaf9b561f705374fb197ec5fe0b19eb428a705f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d10g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d10g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcb07afcca0f03b67812d7e2052623879bf9b5522cd70b3b6d5d04a7c0a82c924",
-                    "mixHash" : "0x6b990671ccc8bc262e1673970b9c3df86417d2a3cf13d6e1574f35e8c98cd095",
-                    "nonce" : "0x0ce79cd83b6e8516",
+                    "hash" : "0xd605e0057d859553cd97ac741a909bd0150e1029799c9593717ecae21ec9a622",
+                    "mixHash" : "0x220193839ea401318ba19f2536435d0f147dde60eb0ae01ac79cd4c3948d19c4",
+                    "nonce" : "0xf23411486053f409",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06b990671ccc8bc262e1673970b9c3df86417d2a3cf13d6e1574f35e8c98cd095880ce79cd83b6e8516f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03cef99f6d853aca552c6d0b012eaa48c40951fe2237a30102d654e08d375e260a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0220193839ea401318ba19f2536435d0f147dde60eb0ae01ac79cd4c3948d19c488f23411486053f409f85ff85d800183061a8080830186a08e60016001600160012160006000f31ca0dd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dffa02a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012160006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb07afcca0f03b67812d7e2052623879bf9b5522cd70b3b6d5d04a7c0a82c924",
+        "lastblockhash" : "0xd605e0057d859553cd97ac741a909bd0150e1029799c9593717ecae21ec9a622",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0.json
index b33898269..6bd4ef0aa 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d110g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4ee7599af0e2c100041debdbac003b67e9497fbe2808ed6863a7b86d9bebe6af",
-                    "mixHash" : "0x1bae1f3b44b6e3185271d9083885c94c2691978be8a2618d9aba89b1eab0253c",
-                    "nonce" : "0x55554866b5f17fb1",
+                    "hash" : "0xa515bfd775e0712387a870cc1dfb55783fce6c83639fc54e5173395dce2c8581",
+                    "mixHash" : "0x13cd023e43a37fbd1a59ca74518855b3e8bc70f63b39a652c60c706af861b3e9",
+                    "nonce" : "0x5fbb55ea4b5504f8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01bae1f3b44b6e3185271d9083885c94c2691978be8a2618d9aba89b1eab0253c8855554866b5f17fb1f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a013cd023e43a37fbd1a59ca74518855b3e8bc70f63b39a652c60c706af861b3e9885fbb55ea4b5504f8f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ee7599af0e2c100041debdbac003b67e9497fbe2808ed6863a7b86d9bebe6af",
+        "lastblockhash" : "0xa515bfd775e0712387a870cc1dfb55783fce6c83639fc54e5173395dce2c8581",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d110g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3ca7294e276ec965104e11a656569cc465dfb18bd7a395f4fcdc611b5b2a1cbe",
-                    "mixHash" : "0xbe2243a07f13de2380b1d382b6002b193e76d390a03464abe032887927bd28a7",
-                    "nonce" : "0x8821470335e7b397",
+                    "hash" : "0xaf35e6f6ac151edf488f29b058fd19126b4aae2a91bf8cbc4e1b82894267aea0",
+                    "mixHash" : "0x8fbf99115fac562e0d505d3fa8b07a07524f7937386a0abe785960a461f31707",
+                    "nonce" : "0xb8592051c00d10ff",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0be2243a07f13de2380b1d382b6002b193e76d390a03464abe032887927bd28a7888821470335e7b397f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08fbf99115fac562e0d505d3fa8b07a07524f7937386a0abe785960a461f3170788b8592051c00d10fff85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ca7294e276ec965104e11a656569cc465dfb18bd7a395f4fcdc611b5b2a1cbe",
+        "lastblockhash" : "0xaf35e6f6ac151edf488f29b058fd19126b4aae2a91bf8cbc4e1b82894267aea0",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d110g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7a67b083ac2b79175cb0d973b261d5792a648267bce2d4d884f7ec9d043b7341",
-                    "mixHash" : "0x30df861c58614d014af3cbc60c8b155cdfaeb51c5d8a5301537faa74d1ffd67e",
-                    "nonce" : "0x4055644ab8c3da6b",
+                    "hash" : "0x596a6fa4b93c3bee833883cf4eddf304e5d0ced4524d1ce7f9aa8efd86435f66",
+                    "mixHash" : "0xddda9fcce71de8cade948d0978aa015a6c908f4ab2746e46ffc57a8f90338655",
+                    "nonce" : "0x228c198c890e93b9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a030df861c58614d014af3cbc60c8b155cdfaeb51c5d8a5301537faa74d1ffd67e884055644ab8c3da6bf85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ddda9fcce71de8cade948d0978aa015a6c908f4ab2746e46ffc57a8f9033865588228c198c890e93b9f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a67b083ac2b79175cb0d973b261d5792a648267bce2d4d884f7ec9d043b7341",
+        "lastblockhash" : "0x596a6fa4b93c3bee833883cf4eddf304e5d0ced4524d1ce7f9aa8efd86435f66",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d110g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe7a9a949cf6432bb20940892c7c7f5fb92a4841f6796d4529d1c1b73c80a4d05",
-                    "mixHash" : "0x1ee518e26729c9e9a0d01f1f14244624194cc721fcf822aad860d01b7e1f1703",
-                    "nonce" : "0xef41a93add6c888b",
+                    "hash" : "0x211009a67e75cc33cc3102db77eafe5d2aac4593807f511ea1439d0b84e40f56",
+                    "mixHash" : "0x909f6b2ea397f2f784e1d65e4a43f1a0b03b50603e583116659f4677de358cf5",
+                    "nonce" : "0x42348222d384ff48",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01ee518e26729c9e9a0d01f1f14244624194cc721fcf822aad860d01b7e1f170388ef41a93add6c888bf85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0909f6b2ea397f2f784e1d65e4a43f1a0b03b50603e583116659f4677de358cf58842348222d384ff48f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7a9a949cf6432bb20940892c7c7f5fb92a4841f6796d4529d1c1b73c80a4d05",
+        "lastblockhash" : "0x211009a67e75cc33cc3102db77eafe5d2aac4593807f511ea1439d0b84e40f56",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d110g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x36b137992e87f620680b21bcdf28f0ba8543e8315321125e91c363e76ec7f475",
-                    "mixHash" : "0x5f66412d261c1f7978f908e0c3a9d8e111a777b7640e6ade24b14e6fd3ddf63d",
-                    "nonce" : "0x3fde3e82bdf7cec0",
+                    "hash" : "0x70ee87c8d400b36c25e175cd915569bde4cb56a505f73d3fc8bd367ee20ca636",
+                    "mixHash" : "0x44b0de8095b85c1d4d30e43e60d75ca306c458ebf0208e57fc7127d0c94b1c1b",
+                    "nonce" : "0xf81b4f88858674e8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05f66412d261c1f7978f908e0c3a9d8e111a777b7640e6ade24b14e6fd3ddf63d883fde3e82bdf7cec0f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a044b0de8095b85c1d4d30e43e60d75ca306c458ebf0208e57fc7127d0c94b1c1b88f81b4f88858674e8f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36b137992e87f620680b21bcdf28f0ba8543e8315321125e91c363e76ec7f475",
+        "lastblockhash" : "0x70ee87c8d400b36c25e175cd915569bde4cb56a505f73d3fc8bd367ee20ca636",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d110g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d110g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1c5e643635ef4266ed9c0f0c478f453ddad019ad3864769dc148ee8e91efa32f",
-                    "mixHash" : "0x6276dfdd150d06000a205430289573de7f62121a492420ed55833bfa358fc6f2",
-                    "nonce" : "0xa8512e8f175cff6d",
+                    "hash" : "0x925a05bc775657b1aa1b448d25ecb2e51deb6ef7ed6dc0c6fcd06fbb42215acf",
+                    "mixHash" : "0x19ffa0ee0e0a501b235d0902d72c1e50c113e47efb9d3d9a1c34930096b45a9b",
+                    "nonce" : "0x72a67f8e25fb1d04",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06276dfdd150d06000a205430289573de7f62121a492420ed55833bfa358fc6f288a8512e8f175cff6df85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ec57fda012e5cf39a253eac8a742ad613f0e4f913bea4668b75b98b5e20a3531a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a019ffa0ee0e0a501b235d0902d72c1e50c113e47efb9d3d9a1c34930096b45a9b8872a67f8e25fb1d04f85ff85d800183061a8080830186a08e6001600160016001eb60006000f31ca02541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555da05b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001eb60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c5e643635ef4266ed9c0f0c478f453ddad019ad3864769dc148ee8e91efa32f",
+        "lastblockhash" : "0x925a05bc775657b1aa1b448d25ecb2e51deb6ef7ed6dc0c6fcd06fbb42215acf",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0.json
index 0330d83ad..c1c4ec4cf 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d111g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd9c926bbc4da4a0caed78647124a6bf4fed4fa4afb4bd421ab6ac3c52be7f940",
-                    "mixHash" : "0x3388eb19a0ca98a605b5562886a64d49dcb8733fa39364d969f27caa7e23da2a",
-                    "nonce" : "0x7f3cf11094736c0d",
+                    "hash" : "0xb0bdb7feecf42d0746d9b522189d1f71f0b4de2a9b0b953b096ad99fedc65ce8",
+                    "mixHash" : "0x1ea2142333c03ae52ae0b5ecf9b07b328d05aa0b75020d12ac97f9b93d96fd64",
+                    "nonce" : "0x800fc0b39eaa9e67",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03388eb19a0ca98a605b5562886a64d49dcb8733fa39364d969f27caa7e23da2a887f3cf11094736c0df85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01ea2142333c03ae52ae0b5ecf9b07b328d05aa0b75020d12ac97f9b93d96fd6488800fc0b39eaa9e67f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9c926bbc4da4a0caed78647124a6bf4fed4fa4afb4bd421ab6ac3c52be7f940",
+        "lastblockhash" : "0xb0bdb7feecf42d0746d9b522189d1f71f0b4de2a9b0b953b096ad99fedc65ce8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d111g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x97528686262b62d66eb69f0f39f1214599d517af3dfefc9af6fd6f7465d28c60",
-                    "mixHash" : "0xf52bcd25130f385fd6505d4ad5cc9ece1decaabe9f3b0c4cc4784795a1f436e8",
-                    "nonce" : "0xdd530ca1f2294ca0",
+                    "hash" : "0xa9a933140c96b7208a5a7bb85f338b0594a646d97b126816ce0856b72f65ec72",
+                    "mixHash" : "0xd5fb6efaab13e9bf883dee7916029d6938d5faeda8314b26b81bfce78ad3b722",
+                    "nonce" : "0x23ab576b3813cbbe",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f52bcd25130f385fd6505d4ad5cc9ece1decaabe9f3b0c4cc4784795a1f436e888dd530ca1f2294ca0f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d5fb6efaab13e9bf883dee7916029d6938d5faeda8314b26b81bfce78ad3b7228823ab576b3813cbbef85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97528686262b62d66eb69f0f39f1214599d517af3dfefc9af6fd6f7465d28c60",
+        "lastblockhash" : "0xa9a933140c96b7208a5a7bb85f338b0594a646d97b126816ce0856b72f65ec72",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d111g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x028e7987e06d0f04035a9398c1052879a4d11a825a395ea3a278bf47d31a1361",
-                    "mixHash" : "0x4c28395245d9588434ae6c60c0c9c27ada67faa015e6effb00730695a48d8b01",
-                    "nonce" : "0x3e0e277a75ed53b9",
+                    "hash" : "0x9d44554c1c49767d0883928913957207ac3bc7a79374107a624aa63087446c9a",
+                    "mixHash" : "0x68c9e6791ad38960bb6fc11da1a6e03be75c8aca9bfc066fff31edcdab384e86",
+                    "nonce" : "0xd6edf2c820ce6bb4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04c28395245d9588434ae6c60c0c9c27ada67faa015e6effb00730695a48d8b01883e0e277a75ed53b9f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a068c9e6791ad38960bb6fc11da1a6e03be75c8aca9bfc066fff31edcdab384e8688d6edf2c820ce6bb4f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x028e7987e06d0f04035a9398c1052879a4d11a825a395ea3a278bf47d31a1361",
+        "lastblockhash" : "0x9d44554c1c49767d0883928913957207ac3bc7a79374107a624aa63087446c9a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d111g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x17850adf5bd6b4351e4610446cc34ff506d7f1a992fc090908804abb41048f82",
-                    "mixHash" : "0x121d23ba0b1fddd7d1272d7905d73eff5e97a2520ce3464f9f0ac9ed697925e8",
-                    "nonce" : "0x32556fd2f6eb0144",
+                    "hash" : "0x04ec7a443c3fd98b282287c9347f5080a9c67e794cfaf6d8be3a081ab5735758",
+                    "mixHash" : "0xa109fbfb758124cbdcea65c7546cf5d0be5523575bb9113316db7bdd27b09ef9",
+                    "nonce" : "0xf0dd98067d2d5050",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0121d23ba0b1fddd7d1272d7905d73eff5e97a2520ce3464f9f0ac9ed697925e88832556fd2f6eb0144f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a109fbfb758124cbdcea65c7546cf5d0be5523575bb9113316db7bdd27b09ef988f0dd98067d2d5050f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17850adf5bd6b4351e4610446cc34ff506d7f1a992fc090908804abb41048f82",
+        "lastblockhash" : "0x04ec7a443c3fd98b282287c9347f5080a9c67e794cfaf6d8be3a081ab5735758",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d111g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x56a809ece95b6ef1ea756c071dfd63e4732b2b0549e662f6a6e7a5d392623844",
-                    "mixHash" : "0x52f5cdeb996e89eab62c7eb220f9aa8ba1d089ad7b8996db34cee0611a3aa7ee",
-                    "nonce" : "0xb23b85f25f3a0cbb",
+                    "hash" : "0xeba73c34380b27628c5c1cbee8b9f6baf633641add26595074b3af5df640c3fe",
+                    "mixHash" : "0x9e2b193146063e7a689b4a196f3a19640625391c8fbc1a1cc1c154da8a658054",
+                    "nonce" : "0xd08e2d78d02afecd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052f5cdeb996e89eab62c7eb220f9aa8ba1d089ad7b8996db34cee0611a3aa7ee88b23b85f25f3a0cbbf85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09e2b193146063e7a689b4a196f3a19640625391c8fbc1a1cc1c154da8a65805488d08e2d78d02afecdf85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56a809ece95b6ef1ea756c071dfd63e4732b2b0549e662f6a6e7a5d392623844",
+        "lastblockhash" : "0xeba73c34380b27628c5c1cbee8b9f6baf633641add26595074b3af5df640c3fe",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d111g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d111g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x25e72bc66d484eca9e355d83932957c36518f7b25111ec9b2d61809d0c9efd38",
-                    "mixHash" : "0x961b71583735bc7934126ad0ef9e0091c9da36f9598ebe8195e26ea63481674f",
-                    "nonce" : "0x952d5739fca2e01d",
+                    "hash" : "0x7c2d1271484b1f4f6864c14d03723d372312106a5650cc650446df25b55c569e",
+                    "mixHash" : "0xfb94570d490e906dc8bf4afac85529998bdf5423d8a74bc8d18a06a6a864c173",
+                    "nonce" : "0x7d24d6f71634c893",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x64ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0961b71583735bc7934126ad0ef9e0091c9da36f9598ebe8195e26ea63481674f88952d5739fca2e01df85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064ac3ec138f598eddf9bf0ba73bc987554395d1c333dbf44a76f8058ffb89b40a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb94570d490e906dc8bf4afac85529998bdf5423d8a74bc8d18a06a6a864c173887d24d6f71634c893f85ff85d800183061a8080830186a08e6001600160016001ec60006000f31ba0ad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86da03fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ec60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25e72bc66d484eca9e355d83932957c36518f7b25111ec9b2d61809d0c9efd38",
+        "lastblockhash" : "0x7c2d1271484b1f4f6864c14d03723d372312106a5650cc650446df25b55c569e",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0.json
index b4410ebda..883895cdf 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d112g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x28398fe5e56ff91ee3ad0b6a83837f7bc62b60ab85aaf93f84c97cc6e74e4ef1",
-                    "mixHash" : "0x059f716149066e7e94a8c54584caadc39fd38d844628b3f7daf9eab1ddf30753",
-                    "nonce" : "0x0cb4866789f51885",
+                    "hash" : "0x5225774db735d308e459132d6a08c0466c16ab08225bd9e0862cf785947330d3",
+                    "mixHash" : "0x8c63afddbf6ea188f311708902aa0b1e8b2c29335b80497882dc585b175f27d6",
+                    "nonce" : "0xce6843705adf9e21",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0059f716149066e7e94a8c54584caadc39fd38d844628b3f7daf9eab1ddf30753880cb4866789f51885f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08c63afddbf6ea188f311708902aa0b1e8b2c29335b80497882dc585b175f27d688ce6843705adf9e21f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28398fe5e56ff91ee3ad0b6a83837f7bc62b60ab85aaf93f84c97cc6e74e4ef1",
+        "lastblockhash" : "0x5225774db735d308e459132d6a08c0466c16ab08225bd9e0862cf785947330d3",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d112g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcb7740a528b4c0538e61869fa6a1a1f9c4d0116be554a88ef5699d6fc9ab89a5",
-                    "mixHash" : "0x67baff35ab5e1ea5dfd1b92063e60fce5c751d23ab0e667d07d7f477b4ac2de2",
-                    "nonce" : "0x8969f99ad42fbd29",
+                    "hash" : "0x511c5d8400b2362ec519ec50db839572d03ea9784f51223a3e5d3a2066290945",
+                    "mixHash" : "0xdb0230fdca40d6a787d733b30d61b1fee10e065afd73b9922f7b4891cbd2fb82",
+                    "nonce" : "0x32e24b23cab1b4e7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a067baff35ab5e1ea5dfd1b92063e60fce5c751d23ab0e667d07d7f477b4ac2de2888969f99ad42fbd29f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0db0230fdca40d6a787d733b30d61b1fee10e065afd73b9922f7b4891cbd2fb828832e24b23cab1b4e7f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb7740a528b4c0538e61869fa6a1a1f9c4d0116be554a88ef5699d6fc9ab89a5",
+        "lastblockhash" : "0x511c5d8400b2362ec519ec50db839572d03ea9784f51223a3e5d3a2066290945",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d112g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf46483f24a07231805784e641f32daf4d1447e86192b5ac918c8d248ded0bf38",
-                    "mixHash" : "0x4cbe0d4ad2d6507fa9725fff0d321d4945aabd675a0c609c3a0eca1344df613e",
-                    "nonce" : "0xfed5efa3da771006",
+                    "hash" : "0x1fe1cb7dad1ab7b4379bea9dafb765506bf243dff99f30378ef131ec2ca1d042",
+                    "mixHash" : "0x891edab14c73c30779ca5c9ef0d1084f87d0429052e7ef4338f67952604103b1",
+                    "nonce" : "0x44d7c0228ec7ca9b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04cbe0d4ad2d6507fa9725fff0d321d4945aabd675a0c609c3a0eca1344df613e88fed5efa3da771006f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0891edab14c73c30779ca5c9ef0d1084f87d0429052e7ef4338f67952604103b18844d7c0228ec7ca9bf85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf46483f24a07231805784e641f32daf4d1447e86192b5ac918c8d248ded0bf38",
+        "lastblockhash" : "0x1fe1cb7dad1ab7b4379bea9dafb765506bf243dff99f30378ef131ec2ca1d042",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d112g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x540b7017e41160b3d06380a9488b22417eed296c7230bba9dee24c46eae6d185",
-                    "mixHash" : "0xb15cb1cdaba4f23d832e1cee37fbc51c1e598ecc5e28d89500896ff850554dee",
-                    "nonce" : "0x512c1ac3cc99b7d7",
+                    "hash" : "0x0aae723906c2eb36424c5dcdcef804bf0ec4bd4bde5f9a7bb60691ee0d055ef6",
+                    "mixHash" : "0x9d7c7189f64d26c3e063fb78fb519682413a29d1f619aaa50e2e1fb14156d2a8",
+                    "nonce" : "0x7c00b7f2ec8ec35e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b15cb1cdaba4f23d832e1cee37fbc51c1e598ecc5e28d89500896ff850554dee88512c1ac3cc99b7d7f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09d7c7189f64d26c3e063fb78fb519682413a29d1f619aaa50e2e1fb14156d2a8887c00b7f2ec8ec35ef85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x540b7017e41160b3d06380a9488b22417eed296c7230bba9dee24c46eae6d185",
+        "lastblockhash" : "0x0aae723906c2eb36424c5dcdcef804bf0ec4bd4bde5f9a7bb60691ee0d055ef6",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d112g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa4141c2079434cbe820e7d69081e640253e6bad109344c76bdeb61d315b1ab0d",
-                    "mixHash" : "0x08fb1fb1f486a6750126d3598193e2e9a828b00ad6ad198c3227e7c751e823e8",
-                    "nonce" : "0xd57c01e0cdce5d20",
+                    "hash" : "0x228c8cc281c257a8ed1af2d02c065e9c29bb2355a3ee879b456048ee78710275",
+                    "mixHash" : "0x673ab971dcaf6060c4e3def8bbced1e9e5fbe1eb2c7ca970056c2ffe5e99977a",
+                    "nonce" : "0x17ebd491861ee1f4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a008fb1fb1f486a6750126d3598193e2e9a828b00ad6ad198c3227e7c751e823e888d57c01e0cdce5d20f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0673ab971dcaf6060c4e3def8bbced1e9e5fbe1eb2c7ca970056c2ffe5e99977a8817ebd491861ee1f4f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4141c2079434cbe820e7d69081e640253e6bad109344c76bdeb61d315b1ab0d",
+        "lastblockhash" : "0x228c8cc281c257a8ed1af2d02c065e9c29bb2355a3ee879b456048ee78710275",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d112g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d112g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc4d6fd539d25d04fca96b58a57408f9274c25b81628c3f5e43a6f33949db6cfc",
-                    "mixHash" : "0xd1efd2d1cba83d2a968305b5c9efa3de3eccc6288d105b22198ef0168586d559",
-                    "nonce" : "0xd9e9640066b55203",
+                    "hash" : "0x789f3b68cb10f0a0b20434e7fc6cc6bd34052f88bc4457212469991a5749bc24",
+                    "mixHash" : "0xb5140dc7902430d477fb82bb331ef1ab4d99f0881cf967ce7b34c05f0faeedb2",
+                    "nonce" : "0xfacb958f1611a82c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xdba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d1efd2d1cba83d2a968305b5c9efa3de3eccc6288d105b22198ef0168586d55988d9e9640066b55203f85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dba9b086efaab774bba4997bdd182792b0513d78fe33d217782283c14865865ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b5140dc7902430d477fb82bb331ef1ab4d99f0881cf967ce7b34c05f0faeedb288facb958f1611a82cf85ff85d800183061a8080830186a08e6001600160016001ed60006000f31ca0de2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501a03ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8ccc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ed60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4d6fd539d25d04fca96b58a57408f9274c25b81628c3f5e43a6f33949db6cfc",
+        "lastblockhash" : "0x789f3b68cb10f0a0b20434e7fc6cc6bd34052f88bc4457212469991a5749bc24",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0.json
index 3eb67218a..6f2754da4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d113g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbf5a15e6b6cf8ff3c9d8353201ffe15dca4859764388179c0ea17180e6a006fe",
-                    "mixHash" : "0x206d9ae18b555ef7ae568fc3f9de8c8ae5a82c27948e2979463b189ee2df0721",
-                    "nonce" : "0x1aea715ff2d06ab1",
+                    "hash" : "0xc3646b3c86e3d024a801405e2175f56187f92dfa0a1a7d6ec07b0c512500db03",
+                    "mixHash" : "0xf0489437bafad18736d63b5bce9c2121323eb62043747610b5deeef021cf30d0",
+                    "nonce" : "0xa6da0cd67835d4d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0206d9ae18b555ef7ae568fc3f9de8c8ae5a82c27948e2979463b189ee2df0721881aea715ff2d06ab1f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f0489437bafad18736d63b5bce9c2121323eb62043747610b5deeef021cf30d088a6da0cd67835d4d6f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf5a15e6b6cf8ff3c9d8353201ffe15dca4859764388179c0ea17180e6a006fe",
+        "lastblockhash" : "0xc3646b3c86e3d024a801405e2175f56187f92dfa0a1a7d6ec07b0c512500db03",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d113g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x731fa399aaa03d88ab265e78e2e06026348ac8b4a216d46fce03c45074fecbdf",
-                    "mixHash" : "0x55d9167fd78eff8d9136db65eb9701d61dd1fe0367e48e8ddfb30ac3c6c98a11",
-                    "nonce" : "0x07c34ed218ae5901",
+                    "hash" : "0xcb750161f3efa9c8eb30f56ba72b21805ccd2e0718d08ce1b58c3df01b88e6fd",
+                    "mixHash" : "0xa873d58b11e1ed95621944d33218adadb84132d314b0fc3a6ce41fe3cfcd8d35",
+                    "nonce" : "0x851b5c7687f81d1c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a055d9167fd78eff8d9136db65eb9701d61dd1fe0367e48e8ddfb30ac3c6c98a118807c34ed218ae5901f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a873d58b11e1ed95621944d33218adadb84132d314b0fc3a6ce41fe3cfcd8d3588851b5c7687f81d1cf85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x731fa399aaa03d88ab265e78e2e06026348ac8b4a216d46fce03c45074fecbdf",
+        "lastblockhash" : "0xcb750161f3efa9c8eb30f56ba72b21805ccd2e0718d08ce1b58c3df01b88e6fd",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d113g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x24cc16243cf7a333a50f58b865e4b143fe946038fc2ead9e997e3957f3b01ee2",
-                    "mixHash" : "0x7f58867a0a6196da37d1872dc975aad672dae3537cb87da541d4e6663bc0b8cb",
-                    "nonce" : "0x2b34ced8fb80850f",
+                    "hash" : "0x093b352dc94cdcc1dc93cb91d3dff98d809ad5469357409f55f90c6adbcca9c3",
+                    "mixHash" : "0xd632aac883c5b7ac05224cd61e8fc5f27bfbe6beea5994065eba26431414a6b1",
+                    "nonce" : "0x65a150cc68f9b4f6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f58867a0a6196da37d1872dc975aad672dae3537cb87da541d4e6663bc0b8cb882b34ced8fb80850ff85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d632aac883c5b7ac05224cd61e8fc5f27bfbe6beea5994065eba26431414a6b18865a150cc68f9b4f6f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24cc16243cf7a333a50f58b865e4b143fe946038fc2ead9e997e3957f3b01ee2",
+        "lastblockhash" : "0x093b352dc94cdcc1dc93cb91d3dff98d809ad5469357409f55f90c6adbcca9c3",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d113g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3bed3e9b5fa05e3145467a7dc6e234c86e40c96af07b6e70f09067daf6093470",
-                    "mixHash" : "0xfc482c9c111459273a5dbe7ce7e518adb64177f89b198abac628245da6e73a98",
-                    "nonce" : "0x30ca3de45ad14841",
+                    "hash" : "0x536f5f8b172a7a490f84058e35d271dba3b96ec8e2d5ee65c7e489ce054266ae",
+                    "mixHash" : "0x36889eab1b4e1883a4091ca7676f830cd269f2973b8afdf68ea472954a01c1ae",
+                    "nonce" : "0xbb994cde1ffac441",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fc482c9c111459273a5dbe7ce7e518adb64177f89b198abac628245da6e73a988830ca3de45ad14841f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a036889eab1b4e1883a4091ca7676f830cd269f2973b8afdf68ea472954a01c1ae88bb994cde1ffac441f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bed3e9b5fa05e3145467a7dc6e234c86e40c96af07b6e70f09067daf6093470",
+        "lastblockhash" : "0x536f5f8b172a7a490f84058e35d271dba3b96ec8e2d5ee65c7e489ce054266ae",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d113g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0fcffb27cb4f9c37cd284950b6ca1332fdae193c7dab9bf06256a0762fc43865",
-                    "mixHash" : "0x6d6b8b9aa3624d93efa1fb3d293ddc146eec379b499eae37169fffe588a0cda3",
-                    "nonce" : "0xd89fea51658701d4",
+                    "hash" : "0x1099b642a54b7b231b1e68661237bd5d92e89107db933afc5b73f24dde4418af",
+                    "mixHash" : "0x1d6f051d484029e0a81fdddf889dbafcb440da75e9526ecb40501662df529aeb",
+                    "nonce" : "0x76b21fb58e9982c6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06d6b8b9aa3624d93efa1fb3d293ddc146eec379b499eae37169fffe588a0cda388d89fea51658701d4f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d6f051d484029e0a81fdddf889dbafcb440da75e9526ecb40501662df529aeb8876b21fb58e9982c6f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fcffb27cb4f9c37cd284950b6ca1332fdae193c7dab9bf06256a0762fc43865",
+        "lastblockhash" : "0x1099b642a54b7b231b1e68661237bd5d92e89107db933afc5b73f24dde4418af",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d113g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d113g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa89d84b53c9363b39c32d068b3e5b2a37b3a2ad3f4935ebc89f123b657ff6b2e",
-                    "mixHash" : "0x81c724805832d4b86e080059bef01d883451e0b2ce2b9ca46a5735ce9cfba004",
-                    "nonce" : "0x13d7a3bbf9b9ab26",
+                    "hash" : "0x090672d918024af7844ef9a1662651c09388e0173d29cee7d2c6791c0c8a2b08",
+                    "mixHash" : "0x7977171143ef8cd04c1fa3749253530457c1a0612d4c1c48d0f01a51bd2e0db7",
+                    "nonce" : "0x22a8212d38c01730",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x1e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a081c724805832d4b86e080059bef01d883451e0b2ce2b9ca46a5735ce9cfba0048813d7a3bbf9b9ab26f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01e3d9e0baa7730141d04395cf78db14716353dc44a541898bcd1be08d09ebbf9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07977171143ef8cd04c1fa3749253530457c1a0612d4c1c48d0f01a51bd2e0db78822a8212d38c01730f85ff85d800183061a8080830186a08e6001600160016001ee60006000f31ba070f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0da008ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ee60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa89d84b53c9363b39c32d068b3e5b2a37b3a2ad3f4935ebc89f123b657ff6b2e",
+        "lastblockhash" : "0x090672d918024af7844ef9a1662651c09388e0173d29cee7d2c6791c0c8a2b08",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0.json
index 58846286f..f186cfd1c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d114g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf842e17bb0c07781e0194d5b76ebdde4ceafef0523575764a7b7cfc9a29626a4",
-                    "mixHash" : "0xa43417904b89929e9539b4332fe2a5960a833c941a8167fab943043d3f3b707b",
-                    "nonce" : "0x51a350de830bf482",
+                    "hash" : "0xd97c874955375d58872fec9f284fd9bb1d34dc9cd1bbc36238ca475633d5d430",
+                    "mixHash" : "0x27efdf19be74cdb5aa1bc2074705ada5cc5b5a578bd9aff2f8faa8845f7ddc3a",
+                    "nonce" : "0x7756d790d2a3f36f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a43417904b89929e9539b4332fe2a5960a833c941a8167fab943043d3f3b707b8851a350de830bf482f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a027efdf19be74cdb5aa1bc2074705ada5cc5b5a578bd9aff2f8faa8845f7ddc3a887756d790d2a3f36ff85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf842e17bb0c07781e0194d5b76ebdde4ceafef0523575764a7b7cfc9a29626a4",
+        "lastblockhash" : "0xd97c874955375d58872fec9f284fd9bb1d34dc9cd1bbc36238ca475633d5d430",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d114g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9dd7318872d5bb1ab3de68c52ec0ad0aa9bbd51af632e0451405d4cb906340d7",
-                    "mixHash" : "0xa135de72eb388f2552c347e192c258dc63e8e6be779c34e034609e9f643a75a8",
-                    "nonce" : "0x962ff4729f2c0991",
+                    "hash" : "0xe02ef013381f1cd38cecb73ad846c97a057c7f3b97d93a3bf503587de39a0178",
+                    "mixHash" : "0x0080cd4b395feafe2f542c22f8892cef36d1693b93f68aabf4113f926e1cf6f1",
+                    "nonce" : "0xdc329a1b4211665e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a135de72eb388f2552c347e192c258dc63e8e6be779c34e034609e9f643a75a888962ff4729f2c0991f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00080cd4b395feafe2f542c22f8892cef36d1693b93f68aabf4113f926e1cf6f188dc329a1b4211665ef85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dd7318872d5bb1ab3de68c52ec0ad0aa9bbd51af632e0451405d4cb906340d7",
+        "lastblockhash" : "0xe02ef013381f1cd38cecb73ad846c97a057c7f3b97d93a3bf503587de39a0178",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d114g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8289101e0d1d533fd33d6ae1feb766909db3ed61c8f5360769a97d50fa102534",
-                    "mixHash" : "0x28945d38d73d90e68ab3798bcbe1caa7d594ff235f2fa96e527c8c24dcfb58d3",
-                    "nonce" : "0x0207fc2f23ac7b92",
+                    "hash" : "0xae6a3415d04c5155b4f5246e9bdd9e7bcca7d25c660fb26e844d5c09267e9e09",
+                    "mixHash" : "0x9513601a1391bbf4502f12914dc90db90d8bc3b86687e80b14edc45f599ef205",
+                    "nonce" : "0xfb9f32cb5df5027d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a028945d38d73d90e68ab3798bcbe1caa7d594ff235f2fa96e527c8c24dcfb58d3880207fc2f23ac7b92f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09513601a1391bbf4502f12914dc90db90d8bc3b86687e80b14edc45f599ef20588fb9f32cb5df5027df85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8289101e0d1d533fd33d6ae1feb766909db3ed61c8f5360769a97d50fa102534",
+        "lastblockhash" : "0xae6a3415d04c5155b4f5246e9bdd9e7bcca7d25c660fb26e844d5c09267e9e09",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d114g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3ec2fff6c957be061d50a00218592b7b933022e67299340ac2b029e002ea6b1c",
-                    "mixHash" : "0xdbab55aa6cb9050590b3491eb1db5b8a8315fdcc3a075bb7efa726cb70a54d73",
-                    "nonce" : "0xd7cadab336b5aaf8",
+                    "hash" : "0xb981581d41d7f3e1b14c726083a48964dc7da7c2ef5f0342c858235ab73c44be",
+                    "mixHash" : "0x87efef3f7388e63eacd25f0564c3b25eb5b02c03e0041ee23e65a11a2c9f7a76",
+                    "nonce" : "0x96bdfb71713ea8b7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dbab55aa6cb9050590b3491eb1db5b8a8315fdcc3a075bb7efa726cb70a54d7388d7cadab336b5aaf8f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a087efef3f7388e63eacd25f0564c3b25eb5b02c03e0041ee23e65a11a2c9f7a768896bdfb71713ea8b7f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ec2fff6c957be061d50a00218592b7b933022e67299340ac2b029e002ea6b1c",
+        "lastblockhash" : "0xb981581d41d7f3e1b14c726083a48964dc7da7c2ef5f0342c858235ab73c44be",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d114g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd17bac6244002d7a0832d162addc727e23ceab1f1b1c17bfa4dee82fa0609969",
-                    "mixHash" : "0x87cb277236f886a2d0c1276d24ae1e5c95744928f6403a74745927204254331c",
-                    "nonce" : "0xd7f9ab399b050ac0",
+                    "hash" : "0x050ae1f034e5d5e0b99c5eb085ba81076cc72f072756fa6f3943bad4946f884d",
+                    "mixHash" : "0x1cfb5f51455dc9b019356a0ac5b8cce387987b319f4e9662ca551f3a3c2c6dfe",
+                    "nonce" : "0x9649335caf61b5ea",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a087cb277236f886a2d0c1276d24ae1e5c95744928f6403a74745927204254331c88d7f9ab399b050ac0f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01cfb5f51455dc9b019356a0ac5b8cce387987b319f4e9662ca551f3a3c2c6dfe889649335caf61b5eaf85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd17bac6244002d7a0832d162addc727e23ceab1f1b1c17bfa4dee82fa0609969",
+        "lastblockhash" : "0x050ae1f034e5d5e0b99c5eb085ba81076cc72f072756fa6f3943bad4946f884d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d114g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d114g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xca4843870e07bd001d8b743a2eba0a83b6508e8decf90d25145ac6a89edf743b",
-                    "mixHash" : "0x71749a3721ef2668396e2c21c538590c9941946cbe2a48637f84b785db14545b",
-                    "nonce" : "0xb1ae5bf42f0d61b9",
+                    "hash" : "0xbb6bfc4cea03218ef379500a7be098f05b9bc62b8e8a49986cd7fa36afc239fb",
+                    "mixHash" : "0x011fccf34c89aaf1ca6217089e58d385163b5b6ade9a3c8989e320ab82e0f747",
+                    "nonce" : "0x80f13b2147d86f04",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x96ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a071749a3721ef2668396e2c21c538590c9941946cbe2a48637f84b785db14545b88b1ae5bf42f0d61b9f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea096ba0d5a211813bd686924dcf94f4de8e9e39ea33df88ccde1592e533cdcf9f9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0011fccf34c89aaf1ca6217089e58d385163b5b6ade9a3c8989e320ab82e0f7478880f13b2147d86f04f85ff85d800183061a8080830186a08e6001600160016001ef60006000f31ba0f2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fda02aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ef60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca4843870e07bd001d8b743a2eba0a83b6508e8decf90d25145ac6a89edf743b",
+        "lastblockhash" : "0xbb6bfc4cea03218ef379500a7be098f05b9bc62b8e8a49986cd7fa36afc239fb",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0.json
index 205289c31..a4b02ec5a 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d115g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x55abe7af6d5271460a6d66cc5dec8b10ae731d1d72ca3ba5af3a71c79f8cbfb7",
-                    "mixHash" : "0x33f6968d6988866d633e8b8570162497a03863af80962ac7edb55e6a6bef72e6",
-                    "nonce" : "0x05ab3a19ceb5029d",
+                    "hash" : "0x5de512f33db401c2fdef3abd080b7b227fd6cdc146636e2eaf9c88da6b495b72",
+                    "mixHash" : "0xdf31c565645294bf6fefef9f607680533f766dcc38821ba764f643cfaf3bc396",
+                    "nonce" : "0x40876585172cec44",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a033f6968d6988866d633e8b8570162497a03863af80962ac7edb55e6a6bef72e68805ab3a19ceb5029df85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0df31c565645294bf6fefef9f607680533f766dcc38821ba764f643cfaf3bc3968840876585172cec44f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55abe7af6d5271460a6d66cc5dec8b10ae731d1d72ca3ba5af3a71c79f8cbfb7",
+        "lastblockhash" : "0x5de512f33db401c2fdef3abd080b7b227fd6cdc146636e2eaf9c88da6b495b72",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d115g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x20385046039287af81c2a32c22673878be81054aab09e1c84c3cf63621f958d6",
-                    "mixHash" : "0x629bdf56df1dcb7f4d421ea363de124fc87829bde66ad19ba7b0c86a87c9cd00",
-                    "nonce" : "0xa255793b7c260600",
+                    "hash" : "0x6f053a600a408a57549c81c9e91bea7425fd31f1b0768943d7a871876ac180fb",
+                    "mixHash" : "0x7e53246e62af812923f1c8c79249b983a7373e122f048da41bf397679ce00779",
+                    "nonce" : "0x7afb280ea59f6e5e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0629bdf56df1dcb7f4d421ea363de124fc87829bde66ad19ba7b0c86a87c9cd0088a255793b7c260600f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07e53246e62af812923f1c8c79249b983a7373e122f048da41bf397679ce00779887afb280ea59f6e5ef85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20385046039287af81c2a32c22673878be81054aab09e1c84c3cf63621f958d6",
+        "lastblockhash" : "0x6f053a600a408a57549c81c9e91bea7425fd31f1b0768943d7a871876ac180fb",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d115g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x33f9937b400b88b1200993cecfe4b0dc8b8afd3b3f3767bb141855837e269ad2",
-                    "mixHash" : "0xbb084f3e48d3360c21f0b8c18be96f084eef827a767f2133afdcddb803bbe248",
-                    "nonce" : "0x3888953f3a6856d3",
+                    "hash" : "0x8ac75e63d43c9a950d8bbd7308d37c5cf6d8391e53e2632b1c046384b30f14b0",
+                    "mixHash" : "0x380ccfa1518db66594e1490f2a0960bd042c3468ab489c6639308bf8750827a0",
+                    "nonce" : "0x1bbc2fd1eb521284",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb084f3e48d3360c21f0b8c18be96f084eef827a767f2133afdcddb803bbe248883888953f3a6856d3f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0380ccfa1518db66594e1490f2a0960bd042c3468ab489c6639308bf8750827a0881bbc2fd1eb521284f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33f9937b400b88b1200993cecfe4b0dc8b8afd3b3f3767bb141855837e269ad2",
+        "lastblockhash" : "0x8ac75e63d43c9a950d8bbd7308d37c5cf6d8391e53e2632b1c046384b30f14b0",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d115g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa9de74ffb3ba8ee4a708aab4873adb344e5468ac18cd570622c2cb5983da234d",
-                    "mixHash" : "0x1ad4037026497d14ae5f038a294ef8c04dbec558ddc22669a448a492e072dffb",
-                    "nonce" : "0x4dd3dfb19e8bf809",
+                    "hash" : "0x82635a49bb5b3b3ee2d2436cb249dad7687476f7459106d7104d6f4453e659ce",
+                    "mixHash" : "0x91d0bdf171139efb67b70e13b854d945350cc4ea5004f739e4ec95f1fa45de6a",
+                    "nonce" : "0x927b6ce5ccdf79fd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01ad4037026497d14ae5f038a294ef8c04dbec558ddc22669a448a492e072dffb884dd3dfb19e8bf809f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091d0bdf171139efb67b70e13b854d945350cc4ea5004f739e4ec95f1fa45de6a88927b6ce5ccdf79fdf85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9de74ffb3ba8ee4a708aab4873adb344e5468ac18cd570622c2cb5983da234d",
+        "lastblockhash" : "0x82635a49bb5b3b3ee2d2436cb249dad7687476f7459106d7104d6f4453e659ce",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d115g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdbc7b0e7e2da5e0f88b82053e6354f63a74c30588ada9c3e612a94e1039052ad",
-                    "mixHash" : "0xb05a27fc5a0bac39332834118f0f8e303564773722eafce1d3f55f8b8b8d7069",
-                    "nonce" : "0x094bfc09c4db2684",
+                    "hash" : "0x140c2316b3c805ff3d3864a066b2e1b4c31af8164f43b2b712281f15d5e8c024",
+                    "mixHash" : "0xaf76ab5b8d9a93d146339d402c824254500f0b45f014660a1024cc365eb69b94",
+                    "nonce" : "0xedb1350a78db9000",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b05a27fc5a0bac39332834118f0f8e303564773722eafce1d3f55f8b8b8d706988094bfc09c4db2684f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0af76ab5b8d9a93d146339d402c824254500f0b45f014660a1024cc365eb69b9488edb1350a78db9000f85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbc7b0e7e2da5e0f88b82053e6354f63a74c30588ada9c3e612a94e1039052ad",
+        "lastblockhash" : "0x140c2316b3c805ff3d3864a066b2e1b4c31af8164f43b2b712281f15d5e8c024",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d115g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d115g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3487b36f62755079f16d48cef7a77397145787decbc0b40c92bb196b5d37e28f",
-                    "mixHash" : "0x8998a16ebe20734e38adf0368c62a77f9b6fe123f5e7081252008fc934e2c486",
-                    "nonce" : "0xd76b756cfd0f6ffc",
+                    "hash" : "0x4a11ae974f200ed1c686df3f8c200f0dde98a30a8a287058b135eb7631c38313",
+                    "mixHash" : "0x6e51600a4594815020b6040807dd94ad4da462eff2b8adc5675f0d541d1a97d0",
+                    "nonce" : "0x601388573c6dd6fa",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08998a16ebe20734e38adf0368c62a77f9b6fe123f5e7081252008fc934e2c48688d76b756cfd0f6ffcf85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0959e216d2e3adfaefffc6bd7b08f467953291c10ffe8038cfba2595099516f81a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06e51600a4594815020b6040807dd94ad4da462eff2b8adc5675f0d541d1a97d088601388573c6dd6faf85ff85d800183061a8080830186a08e6001600160016001f560006000f31ca0bbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675da03b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3487b36f62755079f16d48cef7a77397145787decbc0b40c92bb196b5d37e28f",
+        "lastblockhash" : "0x4a11ae974f200ed1c686df3f8c200f0dde98a30a8a287058b135eb7631c38313",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
index 88f8ff6e3..34ac1c303 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d116g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x73489f21863bad5a74bfc6ff03775a7757543afd93628f337b8d34f76e3b9134",
-                    "mixHash" : "0x475916433907b2513399abe1d5955038a5809691dfd892e4f2c8e313745a96a9",
-                    "nonce" : "0xb8cf29a75ee3b9f1",
+                    "hash" : "0x704ef82f9a77da97b17ac790d9c77692001d760e3829fde350b953f826016a3a",
+                    "mixHash" : "0xaffac7a8abca02c6d7292741846df3670bd94b851d1862a268cce2f9616f9aa1",
+                    "nonce" : "0xc041549191dc57f0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0475916433907b2513399abe1d5955038a5809691dfd892e4f2c8e313745a96a988b8cf29a75ee3b9f1f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0affac7a8abca02c6d7292741846df3670bd94b851d1862a268cce2f9616f9aa188c041549191dc57f0f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73489f21863bad5a74bfc6ff03775a7757543afd93628f337b8d34f76e3b9134",
+        "lastblockhash" : "0x704ef82f9a77da97b17ac790d9c77692001d760e3829fde350b953f826016a3a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d116g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfadaaaceaf70bc8c945c4a3281a589acca169761d3ecfafb11bfb7af3351d682",
-                    "mixHash" : "0xcb84e41e324f704cd6bca497945ab429c8d8708f30d6b2c8e633836cd9a93a36",
-                    "nonce" : "0x98c23526f0abc6da",
+                    "hash" : "0xd63c409075d8a262f068cee9bc389e5fbef5b4b66b7619b7c050f0620660a026",
+                    "mixHash" : "0xf5e15129bb22e230f24f1d8ea4311683c3bb0f689b18a4bd08f725754012dafc",
+                    "nonce" : "0x3311c831f10edce4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cb84e41e324f704cd6bca497945ab429c8d8708f30d6b2c8e633836cd9a93a368898c23526f0abc6daf85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f5e15129bb22e230f24f1d8ea4311683c3bb0f689b18a4bd08f725754012dafc883311c831f10edce4f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfadaaaceaf70bc8c945c4a3281a589acca169761d3ecfafb11bfb7af3351d682",
+        "lastblockhash" : "0xd63c409075d8a262f068cee9bc389e5fbef5b4b66b7619b7c050f0620660a026",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d116g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5015ba06a4c0843b8b5a1464ba8b1c126f6e76f0326024b1921a241d268868e1",
-                    "mixHash" : "0x949892d008851b600efd894cd2a61318c31889aea1f453d56dcd993db00cd373",
-                    "nonce" : "0x694f9d6011531e0e",
+                    "hash" : "0x6bb67953aa336debd3d4a1f15c4b594fb7872d8d4fb509a81fddb36b408ffe7c",
+                    "mixHash" : "0xa0d2b96ea90f508725b7baa238a15e4ebde5a4e73dc87b89d9cad6c0c4c3c011",
+                    "nonce" : "0xeeeda09ccf056b7b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0949892d008851b600efd894cd2a61318c31889aea1f453d56dcd993db00cd37388694f9d6011531e0ef85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a0d2b96ea90f508725b7baa238a15e4ebde5a4e73dc87b89d9cad6c0c4c3c01188eeeda09ccf056b7bf85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5015ba06a4c0843b8b5a1464ba8b1c126f6e76f0326024b1921a241d268868e1",
+        "lastblockhash" : "0x6bb67953aa336debd3d4a1f15c4b594fb7872d8d4fb509a81fddb36b408ffe7c",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d116g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd067b26fbdf3e01923e00f70dc98868461d6f53452e0159055f8d0003ee17c0b",
-                    "mixHash" : "0xf730e6acd890bc051c2d63a8d5253dba12d82e8fb35fea3d3a3a2c37cbd5771e",
-                    "nonce" : "0xe3ccce54c9018f8a",
+                    "hash" : "0xa5c3a2402d30511c7fbd80ff81a98b685bcfbf0bbad34b6df7609c706d566ee6",
+                    "mixHash" : "0x39d1cc9a416a28ad0c54aa0fe8e69b4ac63398b70dab3df0b8e6a272e9bb22d1",
+                    "nonce" : "0x5f0392c4d8bac192",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f730e6acd890bc051c2d63a8d5253dba12d82e8fb35fea3d3a3a2c37cbd5771e88e3ccce54c9018f8af85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a039d1cc9a416a28ad0c54aa0fe8e69b4ac63398b70dab3df0b8e6a272e9bb22d1885f0392c4d8bac192f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd067b26fbdf3e01923e00f70dc98868461d6f53452e0159055f8d0003ee17c0b",
+        "lastblockhash" : "0xa5c3a2402d30511c7fbd80ff81a98b685bcfbf0bbad34b6df7609c706d566ee6",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d116g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd25c71ffc06eddcc0c6d33d24da2133b5e22fc163a502c1850986366925788fa",
-                    "mixHash" : "0xd94bf46270b643377f5cd53802ae9e8cc188b9bab3a69402612da26e514976f9",
-                    "nonce" : "0x4a3e6e9a4d04f334",
+                    "hash" : "0xff8e084a8cda6571eaf6d8df3c33de6ec140dc480787b0bd440a3786211a1713",
+                    "mixHash" : "0x65048dab9ae4117ebb1bce1b9be719c6031fff4fd3288e5c5061c867ba5ec183",
+                    "nonce" : "0x56374a3b619f1a8b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d94bf46270b643377f5cd53802ae9e8cc188b9bab3a69402612da26e514976f9884a3e6e9a4d04f334f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a065048dab9ae4117ebb1bce1b9be719c6031fff4fd3288e5c5061c867ba5ec1838856374a3b619f1a8bf85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd25c71ffc06eddcc0c6d33d24da2133b5e22fc163a502c1850986366925788fa",
+        "lastblockhash" : "0xff8e084a8cda6571eaf6d8df3c33de6ec140dc480787b0bd440a3786211a1713",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d116g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d116g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xec8c42c10fe5a586503e56a82d72fa9a8f98ae2d98559f31b84fb5249a704fd0",
-                    "mixHash" : "0xccb4003ea1d5cb785b0f2cc5f78e7240c25b2d9ca4a58e155a0774547257ec4c",
-                    "nonce" : "0x32eeb0eaede21dd6",
+                    "hash" : "0xb6f64b97979b9479f7ce6d03ceef32149ed81971995ab36385213ba48b187d97",
+                    "mixHash" : "0x13efaae62638b8165301e24e64c3a52545436091fafe11d70a2e35fabbd50823",
+                    "nonce" : "0x6ef5086b106ab1df",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ccb4003ea1d5cb785b0f2cc5f78e7240c25b2d9ca4a58e155a0774547257ec4c8832eeb0eaede21dd6f85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0076ff73feff3d6d9a1a5c271d8a5375e7632ca121a128a6be5377a52705fd616a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a013efaae62638b8165301e24e64c3a52545436091fafe11d70a2e35fabbd50823886ef5086b106ab1dff85ff85d800183061a8080830186a08e6001600160016001f660006000f31ca0c292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641a05a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec8c42c10fe5a586503e56a82d72fa9a8f98ae2d98559f31b84fb5249a704fd0",
+        "lastblockhash" : "0xb6f64b97979b9479f7ce6d03ceef32149ed81971995ab36385213ba48b187d97",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0.json
index fb47ed631..c0d30d991 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d117g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9304bd49adb80a82cc6e746683d8f81de0540827cee7923bcbeea6e5379cf033",
-                    "mixHash" : "0xaa878da265d3832f295436ecd042f9a52648b537fd4e78ac16d216062ca17c94",
-                    "nonce" : "0x4dc2a21b1333c843",
+                    "hash" : "0x378cf78df72faedda4127f3f8f14e2ca16febc80a3ff83810a03baf4990b6819",
+                    "mixHash" : "0xa36f995def2459395cfe4e6a414239008603b70355e124d68d20f73e7882cf05",
+                    "nonce" : "0x25aa5f9c95db804e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aa878da265d3832f295436ecd042f9a52648b537fd4e78ac16d216062ca17c94884dc2a21b1333c843f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a36f995def2459395cfe4e6a414239008603b70355e124d68d20f73e7882cf058825aa5f9c95db804ef85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9304bd49adb80a82cc6e746683d8f81de0540827cee7923bcbeea6e5379cf033",
+        "lastblockhash" : "0x378cf78df72faedda4127f3f8f14e2ca16febc80a3ff83810a03baf4990b6819",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d117g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf87bf22d28dbdae4821ee70b4cea8ada2b6a4646849dd93751e4319c190e26e0",
-                    "mixHash" : "0x0b4614e30dfb186f28878e083f8b15f1d62510d2db8a5a6a30be702b62d8fff6",
-                    "nonce" : "0xa13d83d88337f39c",
+                    "hash" : "0x2159ff6b124a064ada7d7ef4108a7e5776ad584c2076d51bba8fb194accc1a33",
+                    "mixHash" : "0x632dedc8d2be1096a64b7d0193f8bba217cbd31520e9aa03e0ff39b835d7c6be",
+                    "nonce" : "0x48aecea4699877e6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00b4614e30dfb186f28878e083f8b15f1d62510d2db8a5a6a30be702b62d8fff688a13d83d88337f39cf85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0632dedc8d2be1096a64b7d0193f8bba217cbd31520e9aa03e0ff39b835d7c6be8848aecea4699877e6f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf87bf22d28dbdae4821ee70b4cea8ada2b6a4646849dd93751e4319c190e26e0",
+        "lastblockhash" : "0x2159ff6b124a064ada7d7ef4108a7e5776ad584c2076d51bba8fb194accc1a33",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d117g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x62f7ae2d336c9906e49631b8c49eb9b2d7802e8312795945add954d3aedc1059",
-                    "mixHash" : "0x8fef18d82ab68e988574affb8bcd3280b7b320d4730bb5d9d656040ac8ddd7a5",
-                    "nonce" : "0xed82f035f38e043a",
+                    "hash" : "0xe692d813723868c1577035b443a22fd1aec187c46417fcdf138e58ac8467530b",
+                    "mixHash" : "0xef5867ecad851bf5d2ed1c3f7d0cbe59464bdb80353082252e8202c3c481bcaa",
+                    "nonce" : "0xba1b1c992fef51f7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08fef18d82ab68e988574affb8bcd3280b7b320d4730bb5d9d656040ac8ddd7a588ed82f035f38e043af85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef5867ecad851bf5d2ed1c3f7d0cbe59464bdb80353082252e8202c3c481bcaa88ba1b1c992fef51f7f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62f7ae2d336c9906e49631b8c49eb9b2d7802e8312795945add954d3aedc1059",
+        "lastblockhash" : "0xe692d813723868c1577035b443a22fd1aec187c46417fcdf138e58ac8467530b",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d117g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9108fc58204dd4c21b8e6e0ac8afab8d4154349820413007e85ffe714cd30143",
-                    "mixHash" : "0xa4c92db4abf88a92746764ef1227c790bbaea3cd63a73cab200d29afced3b3b5",
-                    "nonce" : "0xb7aea2c90aed9b52",
+                    "hash" : "0x28bd3d0844940503e894407d1058ea3c9f9257ef1cb27e37a796d50201c0273c",
+                    "mixHash" : "0x88bb3d860ac2a5415e7029f6c4032a0a11b4ffd9f7a2b65c3f0bbfb26bbf303c",
+                    "nonce" : "0x59648376a5bddb79",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4c92db4abf88a92746764ef1227c790bbaea3cd63a73cab200d29afced3b3b588b7aea2c90aed9b52f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a088bb3d860ac2a5415e7029f6c4032a0a11b4ffd9f7a2b65c3f0bbfb26bbf303c8859648376a5bddb79f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9108fc58204dd4c21b8e6e0ac8afab8d4154349820413007e85ffe714cd30143",
+        "lastblockhash" : "0x28bd3d0844940503e894407d1058ea3c9f9257ef1cb27e37a796d50201c0273c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d117g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb99869d6a9c5efc01f9ddd3cbe496165ac2d6a6673f156f09b460c005fc2553a",
-                    "mixHash" : "0xac9bab1e704bf6c5e5a164d5670e4b44ed22f225a2fc131512ce06d9d3624b3c",
-                    "nonce" : "0x1deaad60824228ec",
+                    "hash" : "0x97566d2b07940584abe47a3ac63ce074557fe839f4f2951a7349d800cad3c2fe",
+                    "mixHash" : "0x9d5a58d474a29d1e55bfee57ef1f4149233713b2579844831809bc21a6c45d9d",
+                    "nonce" : "0x71a1654c58861508",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac9bab1e704bf6c5e5a164d5670e4b44ed22f225a2fc131512ce06d9d3624b3c881deaad60824228ecf85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09d5a58d474a29d1e55bfee57ef1f4149233713b2579844831809bc21a6c45d9d8871a1654c58861508f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb99869d6a9c5efc01f9ddd3cbe496165ac2d6a6673f156f09b460c005fc2553a",
+        "lastblockhash" : "0x97566d2b07940584abe47a3ac63ce074557fe839f4f2951a7349d800cad3c2fe",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d117g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d117g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7e39ad30f7ccec0f3f4b50370418f475f0ad17d95e5ca2d2d5310e900ec249b8",
-                    "mixHash" : "0x5060f04f063a009612b850c3c208a888d30f20524d01c9ccf8376d2a25432d63",
-                    "nonce" : "0xf8da38f27700f647",
+                    "hash" : "0x4c084f4511477f35e269f4cb8875951ea491e56539e3a010ac6fe200b2b79096",
+                    "mixHash" : "0x6cc97e6c5bdbf1338353cce058e18a2e82ff62350c67ef15029f9ac67fbb2571",
+                    "nonce" : "0x1089f6939e2c5596",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05060f04f063a009612b850c3c208a888d30f20524d01c9ccf8376d2a25432d6388f8da38f27700f647f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c555fa20809e981815a33538bd39cc6abe2354403143d491c6334f9b1e09b7e8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06cc97e6c5bdbf1338353cce058e18a2e82ff62350c67ef15029f9ac67fbb2571881089f6939e2c5596f85ff85d800183061a8080830186a08e6001600160016001f760006000f31ba07264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236ba065d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e39ad30f7ccec0f3f4b50370418f475f0ad17d95e5ca2d2d5310e900ec249b8",
+        "lastblockhash" : "0x4c084f4511477f35e269f4cb8875951ea491e56539e3a010ac6fe200b2b79096",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0.json
index a829a3810..75f2371b9 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d118g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x140904449770d21be1e76a031de79e7470f447a94983401884350e61a7ccb8e6",
-                    "mixHash" : "0xc4c4699afbb9492a4c35bcfe1b67426c78c2d85684f96611738c3984bc0638cd",
-                    "nonce" : "0x6acf6889d0ad1e1d",
+                    "hash" : "0xe1368c1b70ba4336e35af3ef8f6e28b5e2d49473cefe9f9e97217a79bf740a08",
+                    "mixHash" : "0xb97e06fa12976a5d17cc4a7f3ceaa9fe2e08bac3f5d0513bfc04c244a1770428",
+                    "nonce" : "0x92a7bed68dd4e55d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c4c4699afbb9492a4c35bcfe1b67426c78c2d85684f96611738c3984bc0638cd886acf6889d0ad1e1df85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b97e06fa12976a5d17cc4a7f3ceaa9fe2e08bac3f5d0513bfc04c244a17704288892a7bed68dd4e55df85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x140904449770d21be1e76a031de79e7470f447a94983401884350e61a7ccb8e6",
+        "lastblockhash" : "0xe1368c1b70ba4336e35af3ef8f6e28b5e2d49473cefe9f9e97217a79bf740a08",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d118g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x06aa783ddb2671d7e7a3618220bf7b38654b066a7a078b692abc530fbd7b238c",
-                    "mixHash" : "0x4cfa7188b1ddb6ce1f9fb76eadd5220a7f1ae428f88b09f1cbf44c826586581f",
-                    "nonce" : "0x921e4a0c7fa05f9d",
+                    "hash" : "0x6aa83f40ada8a3caa05da8073a66772fb5654227a8dd03f113ec66e62bcd1431",
+                    "mixHash" : "0x526c26bab6cdfd93cf155abfed6dc31fdd83f094cf7e983978f1a22279e2370a",
+                    "nonce" : "0x7f28894a05ead473",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04cfa7188b1ddb6ce1f9fb76eadd5220a7f1ae428f88b09f1cbf44c826586581f88921e4a0c7fa05f9df85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0526c26bab6cdfd93cf155abfed6dc31fdd83f094cf7e983978f1a22279e2370a887f28894a05ead473f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06aa783ddb2671d7e7a3618220bf7b38654b066a7a078b692abc530fbd7b238c",
+        "lastblockhash" : "0x6aa83f40ada8a3caa05da8073a66772fb5654227a8dd03f113ec66e62bcd1431",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d118g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbfda3da899a0bf98324d2614c54ec88a124a618e822fc6c94311d1b83b09227b",
-                    "mixHash" : "0x1d654720a740f337d678c87cec303042086be83793104f425f800934591a94c4",
-                    "nonce" : "0x9a67ba79307d05ed",
+                    "hash" : "0x7da1793a8e955a0612c8a3b9159fd2e6634ca0a31ba77cf3d45199cda703dea8",
+                    "mixHash" : "0xffe6e7597d8d8158a8b71438e03488274cb0fc4d180ba97642d47adadaa84cfc",
+                    "nonce" : "0xa99348e80bee5770",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d654720a740f337d678c87cec303042086be83793104f425f800934591a94c4889a67ba79307d05edf85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffe6e7597d8d8158a8b71438e03488274cb0fc4d180ba97642d47adadaa84cfc88a99348e80bee5770f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfda3da899a0bf98324d2614c54ec88a124a618e822fc6c94311d1b83b09227b",
+        "lastblockhash" : "0x7da1793a8e955a0612c8a3b9159fd2e6634ca0a31ba77cf3d45199cda703dea8",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d118g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2ac27adc7fef1a176be456b98ed7ead0d6b03695f50a82db222390b69f6d464d",
-                    "mixHash" : "0x0e26031c69213d41b91e9852f70ae8ab9bdff1d1158bd9a7b224529ec2ccd1a8",
-                    "nonce" : "0x1b451c2fce2fcb8f",
+                    "hash" : "0xc8d04957a2d97e1a79978c3ecf5ce9fcdc1cb44ab0b85e32d8a479a7beac4dd9",
+                    "mixHash" : "0xa098d753160bb6bde40f90b781ba235fcc6fe2c6c1ddeb6ea5d5e9dffbd10f5f",
+                    "nonce" : "0x856eb8ea9415e8d7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00e26031c69213d41b91e9852f70ae8ab9bdff1d1158bd9a7b224529ec2ccd1a8881b451c2fce2fcb8ff85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a098d753160bb6bde40f90b781ba235fcc6fe2c6c1ddeb6ea5d5e9dffbd10f5f88856eb8ea9415e8d7f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ac27adc7fef1a176be456b98ed7ead0d6b03695f50a82db222390b69f6d464d",
+        "lastblockhash" : "0xc8d04957a2d97e1a79978c3ecf5ce9fcdc1cb44ab0b85e32d8a479a7beac4dd9",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d118g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x47bd5b8c740fa89dea15014bad93f790681fdc451d9ce51cb4d17a784d9b096d",
-                    "mixHash" : "0xbcc7e0fc674c3adbba74de72927b1be55edf81a4c2525af8c7b6f4f1c8be565a",
-                    "nonce" : "0x2f0e3cb4845a1202",
+                    "hash" : "0x401523841eb02f5ccca335f2bc6de0436cc1cc88ff01e3fd7bfd5086bbe347c9",
+                    "mixHash" : "0x6f61c6a98d42f31ab3066fc0ce46cbb7cb8e9e6e92f852d9fb0d20c515c76faa",
+                    "nonce" : "0xfb05c411e2423c1d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bcc7e0fc674c3adbba74de72927b1be55edf81a4c2525af8c7b6f4f1c8be565a882f0e3cb4845a1202f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06f61c6a98d42f31ab3066fc0ce46cbb7cb8e9e6e92f852d9fb0d20c515c76faa88fb05c411e2423c1df85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47bd5b8c740fa89dea15014bad93f790681fdc451d9ce51cb4d17a784d9b096d",
+        "lastblockhash" : "0x401523841eb02f5ccca335f2bc6de0436cc1cc88ff01e3fd7bfd5086bbe347c9",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d118g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d118g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x27ee04a2ab11deb2e85986109a08bb8a166d9854422bd72b0e48c78cc729896c",
-                    "mixHash" : "0x891a7f842c65026c83abf405b9ffb4ffb2d0365ca17e18f3416d4171bb7bc97e",
-                    "nonce" : "0xaf0403a2396e1ca8",
+                    "hash" : "0xf29aa8756ba6e304f7526d7ca6e5b659ac5a31c538bd13ac5c8514b4cfc56b89",
+                    "mixHash" : "0xb9394364f950dedda390936684fb0f3315f47f740277e28c69ef87c7a7d18234",
+                    "nonce" : "0xc7975aa7de5935d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x63542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0891a7f842c65026c83abf405b9ffb4ffb2d0365ca17e18f3416d4171bb7bc97e88af0403a2396e1ca8f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea063542dfce666b428eed846f1cbd78cca3e7f001283cc366ece4508ac039f7389a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b9394364f950dedda390936684fb0f3315f47f740277e28c69ef87c7a7d1823488c7975aa7de5935d6f85ff85d800183061a8080830186a08e6001600160016001f860006000f31ba0705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ada003b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27ee04a2ab11deb2e85986109a08bb8a166d9854422bd72b0e48c78cc729896c",
+        "lastblockhash" : "0xf29aa8756ba6e304f7526d7ca6e5b659ac5a31c538bd13ac5c8514b4cfc56b89",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0.json
index 279e69532..f6f574450 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d119g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3e606fd28b1ad02901f13677cf2cac17c4c005926656c3f339230730f677aa75",
-                    "mixHash" : "0xfead674629f93714c1c2fd147e82265c530c8aa2d02be5fcc9cccdc80be595d0",
-                    "nonce" : "0x50e3257e980ac04c",
+                    "hash" : "0xf358c30b45ff37a717fb714c1ba75398b5a2d7bf6426abd0d317debe7bb814cd",
+                    "mixHash" : "0xdd8c969438450d8f9ab99c7bcf52ef104a959c22ae368f699262a7987c1e0bda",
+                    "nonce" : "0xce376b5a89001e1d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fead674629f93714c1c2fd147e82265c530c8aa2d02be5fcc9cccdc80be595d08850e3257e980ac04cf85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dd8c969438450d8f9ab99c7bcf52ef104a959c22ae368f699262a7987c1e0bda88ce376b5a89001e1df85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e606fd28b1ad02901f13677cf2cac17c4c005926656c3f339230730f677aa75",
+        "lastblockhash" : "0xf358c30b45ff37a717fb714c1ba75398b5a2d7bf6426abd0d317debe7bb814cd",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d119g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4b916221b45026010683b561d4c9aba25245a11c3570c55a1466408fdcebbda0",
-                    "mixHash" : "0x0a671afbb0478c868b6ff28a069ec0cf8b69e6cf5e9bb360865cbfd78fd0ba18",
-                    "nonce" : "0x390b45cbed0e2b3b",
+                    "hash" : "0x6b4e278a5e9b95b6d87d2228ebeeb7cb10f685394c4574d112436535fc477268",
+                    "mixHash" : "0x24c5e2406d0cbb32393e2c1b6a41348bea953829f79ac4e0d5365a31b1d65bc6",
+                    "nonce" : "0x5159b401a3549fde",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00a671afbb0478c868b6ff28a069ec0cf8b69e6cf5e9bb360865cbfd78fd0ba1888390b45cbed0e2b3bf85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a024c5e2406d0cbb32393e2c1b6a41348bea953829f79ac4e0d5365a31b1d65bc6885159b401a3549fdef85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b916221b45026010683b561d4c9aba25245a11c3570c55a1466408fdcebbda0",
+        "lastblockhash" : "0x6b4e278a5e9b95b6d87d2228ebeeb7cb10f685394c4574d112436535fc477268",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d119g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdf98e07274a9eb7a441671ed7a47013643c31caa70101d71f5418897743a622f",
-                    "mixHash" : "0xef5375f549638b64e7ac5200aae4ae8a82b34d4ce2f70ac218cc0441a213dbd0",
-                    "nonce" : "0x01c915a4d5807fd0",
+                    "hash" : "0xabb4cd1d2b57060ce1472a1c72ad589081468ef8a367c1cd74b8cfc9782509f9",
+                    "mixHash" : "0xb0da077d08e37965f1bb871f5cfe1a2f224651ba20ce3d7090e7598304c7d226",
+                    "nonce" : "0x1e6b8bf143d78731",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef5375f549638b64e7ac5200aae4ae8a82b34d4ce2f70ac218cc0441a213dbd08801c915a4d5807fd0f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0da077d08e37965f1bb871f5cfe1a2f224651ba20ce3d7090e7598304c7d226881e6b8bf143d78731f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf98e07274a9eb7a441671ed7a47013643c31caa70101d71f5418897743a622f",
+        "lastblockhash" : "0xabb4cd1d2b57060ce1472a1c72ad589081468ef8a367c1cd74b8cfc9782509f9",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d119g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4d20afe1e3d1dae952008d9053ca9995a9c983dd26f9d1a60dea0618a43c868f",
-                    "mixHash" : "0x96becc2e178d1028e9e9c918cc778ac8650eb441bafb8da483b89b73f41fa3b4",
-                    "nonce" : "0x7c9722cef32e1b2c",
+                    "hash" : "0x2829a8d58eeb1bd572ac3551d367e3c85d5b72702cc6c9238896259212890ab2",
+                    "mixHash" : "0x1f249d374ea0b54c4ed640cb44b554c1dad460b28e8f9b8064e723ce43282d6a",
+                    "nonce" : "0xc6dc32a7b10c0f5d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a096becc2e178d1028e9e9c918cc778ac8650eb441bafb8da483b89b73f41fa3b4887c9722cef32e1b2cf85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f249d374ea0b54c4ed640cb44b554c1dad460b28e8f9b8064e723ce43282d6a88c6dc32a7b10c0f5df85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d20afe1e3d1dae952008d9053ca9995a9c983dd26f9d1a60dea0618a43c868f",
+        "lastblockhash" : "0x2829a8d58eeb1bd572ac3551d367e3c85d5b72702cc6c9238896259212890ab2",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d119g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6002339cd0a98db0579b15bd6cc925ee2ba1573cbb94b3acd8d83e9c1f5fb9a3",
-                    "mixHash" : "0x1ed76734291612453a1d84c353cc516455e4638f3baecfc00d0593691db745d2",
-                    "nonce" : "0x5ab729563eabd6c2",
+                    "hash" : "0x55ef6742f00663aa240527f137caa076769e18c940cc9734dbf6db6a8a0becdd",
+                    "mixHash" : "0x62f2752aa77acb1bec65f5098959b89094e095debaf87a30709d34625a722884",
+                    "nonce" : "0x62dbeab41745b7d9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01ed76734291612453a1d84c353cc516455e4638f3baecfc00d0593691db745d2885ab729563eabd6c2f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a062f2752aa77acb1bec65f5098959b89094e095debaf87a30709d34625a7228848862dbeab41745b7d9f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6002339cd0a98db0579b15bd6cc925ee2ba1573cbb94b3acd8d83e9c1f5fb9a3",
+        "lastblockhash" : "0x55ef6742f00663aa240527f137caa076769e18c940cc9734dbf6db6a8a0becdd",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d119g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d119g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd8ba09b9a7a266b3afb23c3e1f534072706a76b5f8e5e83ea2eb8f745f01e0a1",
-                    "mixHash" : "0x3ddeace96ba2b3328859f48f89ff2f24d9099ec3690c48f1855f1a35e380aa3b",
-                    "nonce" : "0x2dfaf78452c3cf24",
+                    "hash" : "0x017891f61f9f5cfde6fbde07845437a08c783430ba8da8f6895f7b35ed54c4dd",
+                    "mixHash" : "0x8f061fdc14b49e91b62acd87feeafcdc0b1498a1d9fb5e77c95e53248c74fae0",
+                    "nonce" : "0x2abbc3c148a35b86",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x2827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ddeace96ba2b3328859f48f89ff2f24d9099ec3690c48f1855f1a35e380aa3b882dfaf78452c3cf24f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02827827473d829fc8f991477245f1e44e5182fd3c483df7b345f2e994e8702dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08f061fdc14b49e91b62acd87feeafcdc0b1498a1d9fb5e77c95e53248c74fae0882abbc3c148a35b86f85ff85d800183061a8080830186a08e6001600160016001f960006000f31ba00fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57a0533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001f960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8ba09b9a7a266b3afb23c3e1f534072706a76b5f8e5e83ea2eb8f745f01e0a1",
+        "lastblockhash" : "0x017891f61f9f5cfde6fbde07845437a08c783430ba8da8f6895f7b35ed54c4dd",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0.json
index b1d5695a4..dff3ba74f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d11g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x21160fa9b198fe93c0366b4fa50721b76819f700d47eb2efc1803cf26fc9dc13",
-                    "mixHash" : "0xe1f22bf68ec1e0ddf9318715522cf2ac930775375f387c30da5960f38ad40fc9",
-                    "nonce" : "0xd61f0e349b64da66",
+                    "hash" : "0x4c5c3a7cc74ecddad911fa16ae24e8834253d10632f90c804707be78709aae71",
+                    "mixHash" : "0x9abd0c50c72c18937ec250027f50339baf154d10668332fc0118bd7f8667c3d9",
+                    "nonce" : "0x59998adc280f2770",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e1f22bf68ec1e0ddf9318715522cf2ac930775375f387c30da5960f38ad40fc988d61f0e349b64da66f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09abd0c50c72c18937ec250027f50339baf154d10668332fc0118bd7f8667c3d98859998adc280f2770f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21160fa9b198fe93c0366b4fa50721b76819f700d47eb2efc1803cf26fc9dc13",
+        "lastblockhash" : "0x4c5c3a7cc74ecddad911fa16ae24e8834253d10632f90c804707be78709aae71",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d11g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfbb646b864ef552fa6108c4c991926e798731f1ef1642f9bee542b9972316b57",
-                    "mixHash" : "0x3ef026b55185e8885389253c8d82f72c1ae8d9923e91f82f56c0cb0300c91e5c",
-                    "nonce" : "0x53cac080eb7aa0fb",
+                    "hash" : "0x617503d97ae5ab5b6350eeaf7f69f5e341ad5dc98f3b1d09d9f25ec1d8439345",
+                    "mixHash" : "0x86e523e5746a3530594ddc12d3833f37d091f35ef84cff770e8cb7edc0054d80",
+                    "nonce" : "0x846d13d3155526a2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ef026b55185e8885389253c8d82f72c1ae8d9923e91f82f56c0cb0300c91e5c8853cac080eb7aa0fbf85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a086e523e5746a3530594ddc12d3833f37d091f35ef84cff770e8cb7edc0054d8088846d13d3155526a2f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbb646b864ef552fa6108c4c991926e798731f1ef1642f9bee542b9972316b57",
+        "lastblockhash" : "0x617503d97ae5ab5b6350eeaf7f69f5e341ad5dc98f3b1d09d9f25ec1d8439345",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d11g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6b85241ac8e57fd2bee2fb13a6e36831012d0c4f4400b95c646fdcbaa24b293a",
-                    "mixHash" : "0xfc15fda2c863c90bd4648224e2822286fbecc5e61fe133aeead63eebf2e8cee9",
-                    "nonce" : "0xd39a95927f91b663",
+                    "hash" : "0x9468a9605255a429b4f166d8c024f874a62041d440c993511ac323dcda762783",
+                    "mixHash" : "0xd44d7a94d3cb55e1e4c2cded5270c9f23945f2c1980354e17188b402bdc4fe5c",
+                    "nonce" : "0x0ce69e5d17219da0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fc15fda2c863c90bd4648224e2822286fbecc5e61fe133aeead63eebf2e8cee988d39a95927f91b663f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d44d7a94d3cb55e1e4c2cded5270c9f23945f2c1980354e17188b402bdc4fe5c880ce69e5d17219da0f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b85241ac8e57fd2bee2fb13a6e36831012d0c4f4400b95c646fdcbaa24b293a",
+        "lastblockhash" : "0x9468a9605255a429b4f166d8c024f874a62041d440c993511ac323dcda762783",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d11g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x05d4187bfd0bc1202c80d6ef0772cd9890b5d3eca20d1afb068d7b2d6a3f4f3b",
-                    "mixHash" : "0xc0ca31fb6e369b8eaa9674b3fcdbe8cff3321fc4e0f8db79429778ea6b62b487",
-                    "nonce" : "0x8f0c7e1388f6732e",
+                    "hash" : "0x81f35710dc388d4422ab23aec82c7d3247ce7afc37fc6dff81ef168d758c3d1d",
+                    "mixHash" : "0xf3cda58deba79be4af889fc7080729ad41159dc379fa5b760ffe192a14a570a2",
+                    "nonce" : "0x08baded1cdbd4741",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c0ca31fb6e369b8eaa9674b3fcdbe8cff3321fc4e0f8db79429778ea6b62b487888f0c7e1388f6732ef85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f3cda58deba79be4af889fc7080729ad41159dc379fa5b760ffe192a14a570a28808baded1cdbd4741f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05d4187bfd0bc1202c80d6ef0772cd9890b5d3eca20d1afb068d7b2d6a3f4f3b",
+        "lastblockhash" : "0x81f35710dc388d4422ab23aec82c7d3247ce7afc37fc6dff81ef168d758c3d1d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d11g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0947a8ffba12a96ec811575c4223c6c0b77392919f11333b991a573df6abb4f0",
-                    "mixHash" : "0xc8629dd2f3602a548fa1a77ab30f2fb579d3f020e149cf2a2e43ddced1a1bef5",
-                    "nonce" : "0x84abd75477b94987",
+                    "hash" : "0x1ee16ed4d6a92fdc672f439f802df22f67c331052f6222a5be6d278a79277436",
+                    "mixHash" : "0x478aa3bed07e8d9968958fef57459b6c28ea8457da9946780a4c73616d45bc95",
+                    "nonce" : "0x7942c12debd2bb32",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c8629dd2f3602a548fa1a77ab30f2fb579d3f020e149cf2a2e43ddced1a1bef58884abd75477b94987f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0478aa3bed07e8d9968958fef57459b6c28ea8457da9946780a4c73616d45bc95887942c12debd2bb32f85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0947a8ffba12a96ec811575c4223c6c0b77392919f11333b991a573df6abb4f0",
+        "lastblockhash" : "0x1ee16ed4d6a92fdc672f439f802df22f67c331052f6222a5be6d278a79277436",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d11g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d11g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4a785ecc0e7e60e4d04751befd8c8a25474a0cb64ff4e08624c861f93fe3f4f6",
-                    "mixHash" : "0x429ba7ebb44d7e16a7f8323263a95f424780317bf6fcb948cf898f88a381f9f7",
-                    "nonce" : "0x8fa7c8c818cc141c",
+                    "hash" : "0x9c6b2f697329090804934e9d89fa642a6367b48eee196a03796afeaea76a78a1",
+                    "mixHash" : "0x0cdcd5c2b18ff80c934f965b4eb7f13f944c003cfcae292c2963809605367e72",
+                    "nonce" : "0x707d61671efcbb5c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0429ba7ebb44d7e16a7f8323263a95f424780317bf6fcb948cf898f88a381f9f7888fa7c8c818cc141cf85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05f2e835d2e78f91607645c1c90314d079173fd3e156ae306bb04cb2a3326b266a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00cdcd5c2b18ff80c934f965b4eb7f13f944c003cfcae292c2963809605367e7288707d61671efcbb5cf85ff85d800183061a8080830186a08e60016001600160012260006000f31ca04ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534a06ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012260006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a785ecc0e7e60e4d04751befd8c8a25474a0cb64ff4e08624c861f93fe3f4f6",
+        "lastblockhash" : "0x9c6b2f697329090804934e9d89fa642a6367b48eee196a03796afeaea76a78a1",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0.json
index d3166c514..e94ed7161 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d120g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdd2a3c833eaf5bbb3c5e0459f66a7bcc2e7c145732448f165ffce67d5f3cb7db",
-                    "mixHash" : "0xccd04e095e61b447982e89793339b5434f4ad4c937e957fce0be88d342acd5e6",
-                    "nonce" : "0xf6da64e1ddef59f9",
+                    "hash" : "0xc8082c886e68fe0c71315ea1bcee08e2b978ad96c3d80e3b91b81a41cc7ea654",
+                    "mixHash" : "0xc76d01b9f7542798130b552dc40ede7091faeed6f306c016bd0bc7fd950b69dc",
+                    "nonce" : "0xe585cf95bbb68371",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ccd04e095e61b447982e89793339b5434f4ad4c937e957fce0be88d342acd5e688f6da64e1ddef59f9f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c76d01b9f7542798130b552dc40ede7091faeed6f306c016bd0bc7fd950b69dc88e585cf95bbb68371f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd2a3c833eaf5bbb3c5e0459f66a7bcc2e7c145732448f165ffce67d5f3cb7db",
+        "lastblockhash" : "0xc8082c886e68fe0c71315ea1bcee08e2b978ad96c3d80e3b91b81a41cc7ea654",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d120g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8ae895a904c149eee1c59f7d222026409c30a8fbf71d74d1d99ed0629197107e",
-                    "mixHash" : "0x7d65b6132edddcf8fddf91567743a85d755090f8e52055d291569a673410fa3f",
-                    "nonce" : "0x4ee6df1a86cceb0e",
+                    "hash" : "0xbac61dad81bb36d7e797761f3121a293ab78711eb53945ca20c9867064245f8b",
+                    "mixHash" : "0x828d78614ddc0b64a3f96cc5a4b5e491fca4c5d0cc11df685f9e16f6775bbe05",
+                    "nonce" : "0xa910dab16c29d887",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07d65b6132edddcf8fddf91567743a85d755090f8e52055d291569a673410fa3f884ee6df1a86cceb0ef85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0828d78614ddc0b64a3f96cc5a4b5e491fca4c5d0cc11df685f9e16f6775bbe0588a910dab16c29d887f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ae895a904c149eee1c59f7d222026409c30a8fbf71d74d1d99ed0629197107e",
+        "lastblockhash" : "0xbac61dad81bb36d7e797761f3121a293ab78711eb53945ca20c9867064245f8b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d120g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa0c53a6ba2378b01a23e4054ce74472de5c4c82594401d3f187fb3dceb8160d6",
-                    "mixHash" : "0x10b1334353920aec7dc3a7c0cd09c31f1223da4b70762fd9c56994cf9fb7ea1d",
-                    "nonce" : "0x2e4a1567960ad571",
+                    "hash" : "0x539bc585a973e63988fa539f9d221303feae1f34881110726940488f9794fbf5",
+                    "mixHash" : "0xe5e8fd5d883133dfca3407f7a4fd0dbb54dab1b2b407b4a4ed0187c603cb9df2",
+                    "nonce" : "0x8b4f3ffe8c459722",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a010b1334353920aec7dc3a7c0cd09c31f1223da4b70762fd9c56994cf9fb7ea1d882e4a1567960ad571f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e5e8fd5d883133dfca3407f7a4fd0dbb54dab1b2b407b4a4ed0187c603cb9df2888b4f3ffe8c459722f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0c53a6ba2378b01a23e4054ce74472de5c4c82594401d3f187fb3dceb8160d6",
+        "lastblockhash" : "0x539bc585a973e63988fa539f9d221303feae1f34881110726940488f9794fbf5",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d120g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa2b3563dc8f436759e6bac35d197919d7a3fb8559fb1dfca94188a2ee900b872",
-                    "mixHash" : "0x02c1e26f74299ee2e9fb424efd605a2cb681b36a616d7764df56b063e0a235cd",
-                    "nonce" : "0x16e3b92f28f32fd6",
+                    "hash" : "0x402f2d603bcede33ca022326dcd9524f64ffdea101a9dc4c71687433aed76292",
+                    "mixHash" : "0x2b46e0b76ae4895020c6b47a9d4fe77bb5b4a8ac7c5830d8ca33a088e93e339a",
+                    "nonce" : "0x811f07d834ba94c1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002c1e26f74299ee2e9fb424efd605a2cb681b36a616d7764df56b063e0a235cd8816e3b92f28f32fd6f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b46e0b76ae4895020c6b47a9d4fe77bb5b4a8ac7c5830d8ca33a088e93e339a88811f07d834ba94c1f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2b3563dc8f436759e6bac35d197919d7a3fb8559fb1dfca94188a2ee900b872",
+        "lastblockhash" : "0x402f2d603bcede33ca022326dcd9524f64ffdea101a9dc4c71687433aed76292",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d120g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb550ec3c1fa683d82c8de338398fbd604f1c4439fc872c5bcb6b9239c6d1a08f",
-                    "mixHash" : "0x8a3eec46ce1542c5a03f1ec6d1214eafd61acc7c7d3b3b55753d4a869a620751",
-                    "nonce" : "0xe641fa9f81e3ab01",
+                    "hash" : "0x76a52e0c475f3aacca4de8bf3c4089236e22cd15a77a467d81d76f47255266ed",
+                    "mixHash" : "0x2abf1c38545e708c603a332e365dc73542d74b98bf4e79b55502dee317716dc9",
+                    "nonce" : "0xe6039ae648d421e5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08a3eec46ce1542c5a03f1ec6d1214eafd61acc7c7d3b3b55753d4a869a62075188e641fa9f81e3ab01f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02abf1c38545e708c603a332e365dc73542d74b98bf4e79b55502dee317716dc988e6039ae648d421e5f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb550ec3c1fa683d82c8de338398fbd604f1c4439fc872c5bcb6b9239c6d1a08f",
+        "lastblockhash" : "0x76a52e0c475f3aacca4de8bf3c4089236e22cd15a77a467d81d76f47255266ed",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d120g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d120g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdff78347ecf4ac740cb04f77d6b6ffdc26f6bcfbb024605105de14263e8d2251",
-                    "mixHash" : "0x2d3e017138c7be23697da3e30987d2c67d3aaae569d97e194b3e7ee2cec387bc",
-                    "nonce" : "0x61b76ce092b63b42",
+                    "hash" : "0xf953cc783b52a776a0a304ceb523505a1ad8d3a69e2873dd40e92d8ac8558744",
+                    "mixHash" : "0xcbcfdcc4411ad63a64aa78b3dbc81b49183b37704852fecbbaea86ce76b5974f",
+                    "nonce" : "0x3fcbd6d097342caf",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x68b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d3e017138c7be23697da3e30987d2c67d3aaae569d97e194b3e7ee2cec387bc8861b76ce092b63b42f85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea068b9bb98e441b59665a56d7a0c85016c06020f390c06c36a7bbf909e1f7cde9da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cbcfdcc4411ad63a64aa78b3dbc81b49183b37704852fecbbaea86ce76b5974f883fcbd6d097342caff85ff85d800183061a8080830186a08e6001600160016001fc60006000f31ba026f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04a0067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fc60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdff78347ecf4ac740cb04f77d6b6ffdc26f6bcfbb024605105de14263e8d2251",
+        "lastblockhash" : "0xf953cc783b52a776a0a304ceb523505a1ad8d3a69e2873dd40e92d8ac8558744",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0.json
index fca142a0a..497c0088e 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d121g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbbad4bbca3af6e744d73722e8059595155c19afc270493155c35d65d05925e0e",
-                    "mixHash" : "0xbcf4d690d07d9ed8711a5e3c0c794281085b464db9ed25e2d1b1ea42449af4fc",
-                    "nonce" : "0x8e3c6f4fc4d2f9be",
+                    "hash" : "0x7a42265e1f32a09af46262e16dcbf907626cdc0fd5d3dac98023b0ed6dc8fc11",
+                    "mixHash" : "0xf6ce85af9dad52256c00779933f341e5ed7dd8fc367c54d1fd0c9a209c2b718b",
+                    "nonce" : "0x47ef990f3e4362ef",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bcf4d690d07d9ed8711a5e3c0c794281085b464db9ed25e2d1b1ea42449af4fc888e3c6f4fc4d2f9bef85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f6ce85af9dad52256c00779933f341e5ed7dd8fc367c54d1fd0c9a209c2b718b8847ef990f3e4362eff85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbbad4bbca3af6e744d73722e8059595155c19afc270493155c35d65d05925e0e",
+        "lastblockhash" : "0x7a42265e1f32a09af46262e16dcbf907626cdc0fd5d3dac98023b0ed6dc8fc11",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d121g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0787b3eb85eace0d2f1e8ee9938b0309cfd6223703ef3db306f9731ecf087e21",
-                    "mixHash" : "0xb779ad762ed852880b2cc4b57c1641a3dc8f3103bb973d3b275d33b9163eaa08",
-                    "nonce" : "0x1301a5e7043f08c1",
+                    "hash" : "0xb40319f0a6e7dc3e48658f9c56f138a32488a99c7ce98e634e823140ddb13eab",
+                    "mixHash" : "0x665cd07d5963ceca11191aa75221c6b8eac26ee21d0ab2b86b6da18222da1580",
+                    "nonce" : "0x05f3924f175b3f69",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b779ad762ed852880b2cc4b57c1641a3dc8f3103bb973d3b275d33b9163eaa08881301a5e7043f08c1f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0665cd07d5963ceca11191aa75221c6b8eac26ee21d0ab2b86b6da18222da15808805f3924f175b3f69f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0787b3eb85eace0d2f1e8ee9938b0309cfd6223703ef3db306f9731ecf087e21",
+        "lastblockhash" : "0xb40319f0a6e7dc3e48658f9c56f138a32488a99c7ce98e634e823140ddb13eab",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d121g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x58b572e4a150ab1790c1fcae885fe1aa48192fe5fc3f5bb565c6c27e40048050",
-                    "mixHash" : "0x43e7945b1a3716de165510d65098c6e2ec8ca59c08b907d5f0a2039c4eb46d9d",
-                    "nonce" : "0x1ba78dca02891bb7",
+                    "hash" : "0x6fbd3e17dbeca915fe4a1ba042c91edb1f26e82adea9c147d1a3db644a5eccd9",
+                    "mixHash" : "0x0c792f64b475df4c7842e5d0343e52d1b561c37960bf7b1ceffb926ec99b81b4",
+                    "nonce" : "0x96f1048b99e03cf3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043e7945b1a3716de165510d65098c6e2ec8ca59c08b907d5f0a2039c4eb46d9d881ba78dca02891bb7f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00c792f64b475df4c7842e5d0343e52d1b561c37960bf7b1ceffb926ec99b81b48896f1048b99e03cf3f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58b572e4a150ab1790c1fcae885fe1aa48192fe5fc3f5bb565c6c27e40048050",
+        "lastblockhash" : "0x6fbd3e17dbeca915fe4a1ba042c91edb1f26e82adea9c147d1a3db644a5eccd9",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d121g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x321369aea0f0bdcaffe83a4933334c7f49cc2568f6df56da25505e0f03b81e63",
-                    "mixHash" : "0x0ea4235f21e9804f72deff4c3b6f7c4e0b0b4086e6236e5b2088867a3b3fab90",
-                    "nonce" : "0xb2d9a4376839d542",
+                    "hash" : "0xc2b6c646c346858caa131337d63d5d0acb8dbacc83a57080ad7b70febed8304e",
+                    "mixHash" : "0x43ee314ccd8688a2319721b5cb27af802ca6b69833b7d8b6b759a1eec181b2ff",
+                    "nonce" : "0xe32dd7920f0ad84a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00ea4235f21e9804f72deff4c3b6f7c4e0b0b4086e6236e5b2088867a3b3fab9088b2d9a4376839d542f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043ee314ccd8688a2319721b5cb27af802ca6b69833b7d8b6b759a1eec181b2ff88e32dd7920f0ad84af85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x321369aea0f0bdcaffe83a4933334c7f49cc2568f6df56da25505e0f03b81e63",
+        "lastblockhash" : "0xc2b6c646c346858caa131337d63d5d0acb8dbacc83a57080ad7b70febed8304e",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d121g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcab6883d04ffca53fb42fe6c3af9355ab038aaa9b8b661598eb9e51fdbd05356",
-                    "mixHash" : "0x2d549f7cb3523b90d4f5c8fa4e6a690d0489cab35b60ae1c8959bcf34af656aa",
-                    "nonce" : "0x67d30413c6e429de",
+                    "hash" : "0x9bb11f6687910d4b96bf317eaccfcfe34632fa3eed2f9d47ec7d47c235ce29ad",
+                    "mixHash" : "0x1f18ef35de7ca95eac29b825afd633ec04c3a5c1aec5dc26e52c8a0597a770e1",
+                    "nonce" : "0x44df95d8759518d3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d549f7cb3523b90d4f5c8fa4e6a690d0489cab35b60ae1c8959bcf34af656aa8867d30413c6e429def85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f18ef35de7ca95eac29b825afd633ec04c3a5c1aec5dc26e52c8a0597a770e18844df95d8759518d3f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcab6883d04ffca53fb42fe6c3af9355ab038aaa9b8b661598eb9e51fdbd05356",
+        "lastblockhash" : "0x9bb11f6687910d4b96bf317eaccfcfe34632fa3eed2f9d47ec7d47c235ce29ad",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d121g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d121g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xecfb8fecf67b12aae7d761451b9c93515d169529abad279bcc2e4546e003b028",
-                    "mixHash" : "0x1643d1d2b91fb6125495b9c2b895a7ccf97d1effaa33295dd41b725804f02c4c",
-                    "nonce" : "0x18348b75b765e9b8",
+                    "hash" : "0xf5690c99fc4e898c79a38da9dd5eb7c96706bc6d296c7f5e5aae6c232285fec4",
+                    "mixHash" : "0x978b6eaaa3787bc60deda1fe552eb4976d6b5660ca334b0001b6bc651ae9b162",
+                    "nonce" : "0xcb6d621eda3668b2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xe74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01643d1d2b91fb6125495b9c2b895a7ccf97d1effaa33295dd41b725804f02c4c8818348b75b765e9b8f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e74f3fe50de3c4daf9593c9070fbd8e087086c569d9520c3f93079715d199b2ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0978b6eaaa3787bc60deda1fe552eb4976d6b5660ca334b0001b6bc651ae9b16288cb6d621eda3668b2f85ff85d800183061a8080830186a08e6001600160016001fe60006000f31ca0e7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433deaa06e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001fe60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecfb8fecf67b12aae7d761451b9c93515d169529abad279bcc2e4546e003b028",
+        "lastblockhash" : "0xf5690c99fc4e898c79a38da9dd5eb7c96706bc6d296c7f5e5aae6c232285fec4",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0.json
index c2cc5bd63..7d2f98c9a 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d12g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x84b1f75f01e1c08cffddda78b8387dfb134bb6efb955c58c2020fe84587dc3ac",
-                    "mixHash" : "0xaead1d32a9813cbb4a32bbf1f6d05fd40a0f5a0016907ec3b9d77ae73659835b",
-                    "nonce" : "0xb75868f0ee437964",
+                    "hash" : "0xfbe5c509aa675bf00488c5432c041d30c43d670fa14f4d8393cc734e343d9a87",
+                    "mixHash" : "0x92d584de38058a9b9b7c88b18478e04288b4b8404e57ddbf047865fd283e5a7a",
+                    "nonce" : "0x894519a65769c332",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aead1d32a9813cbb4a32bbf1f6d05fd40a0f5a0016907ec3b9d77ae73659835b88b75868f0ee437964f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a092d584de38058a9b9b7c88b18478e04288b4b8404e57ddbf047865fd283e5a7a88894519a65769c332f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84b1f75f01e1c08cffddda78b8387dfb134bb6efb955c58c2020fe84587dc3ac",
+        "lastblockhash" : "0xfbe5c509aa675bf00488c5432c041d30c43d670fa14f4d8393cc734e343d9a87",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d12g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x422ab7e39dd6187c561ec37bf7a1ab2e4d2fc2f067f1e698f6fba7129141a607",
-                    "mixHash" : "0x82e7ebee9a2d8ad580366bc483ba919423324c9941626a3f8364545d02df05dd",
-                    "nonce" : "0x9ba82300797138b7",
+                    "hash" : "0x0a5c484fe75dda04fbf36c2ff5716dff2ba292db625d7baa883952ad75e0da22",
+                    "mixHash" : "0x432d9ffbd9f62fa4f3d82418a04d8f95bc8622686b7ea33fd677a8bf9709b9a4",
+                    "nonce" : "0x20d5c16b2486ce02",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082e7ebee9a2d8ad580366bc483ba919423324c9941626a3f8364545d02df05dd889ba82300797138b7f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0432d9ffbd9f62fa4f3d82418a04d8f95bc8622686b7ea33fd677a8bf9709b9a48820d5c16b2486ce02f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x422ab7e39dd6187c561ec37bf7a1ab2e4d2fc2f067f1e698f6fba7129141a607",
+        "lastblockhash" : "0x0a5c484fe75dda04fbf36c2ff5716dff2ba292db625d7baa883952ad75e0da22",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d12g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe39f7aae523ad362f6d20b3303313c90a1fe59f5b7997c0a8975c28324d3420d",
-                    "mixHash" : "0xf5a1b3f31cfb67f10a0534ada84510cb069ed639b740b2095170ab22d05aaf92",
-                    "nonce" : "0x7c090f6321c60c55",
+                    "hash" : "0xb13c9f8a903ebcc082ac32cfc760b21d556f26c89e966cba5a1d69cfd67ddcf8",
+                    "mixHash" : "0xe2e0f7f52ae22a5b7ce49132395c812cf30cc1569c7cdbf4775a470a8e45b4bd",
+                    "nonce" : "0x67214f42b3dc96ac",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f5a1b3f31cfb67f10a0534ada84510cb069ed639b740b2095170ab22d05aaf92887c090f6321c60c55f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e2e0f7f52ae22a5b7ce49132395c812cf30cc1569c7cdbf4775a470a8e45b4bd8867214f42b3dc96acf85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe39f7aae523ad362f6d20b3303313c90a1fe59f5b7997c0a8975c28324d3420d",
+        "lastblockhash" : "0xb13c9f8a903ebcc082ac32cfc760b21d556f26c89e966cba5a1d69cfd67ddcf8",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d12g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0fac3221d8632df9bfcf7c189bedfec17e791f90ad6191bed40b42982447e9f2",
-                    "mixHash" : "0x946b27f236c38afb5c2d51cad3009a8ac0009d7a4468ee14e58d98946605f8b4",
-                    "nonce" : "0x8df3b2d066fcf9b9",
+                    "hash" : "0x3fdfd84d75d9db4acfabacd1979ffff726714e9a9075ffd56dc2092f0b9791e3",
+                    "mixHash" : "0xd9059bc2e00534194085b38190ecd891d0e4d7c6662f58567eadea71d7e18d22",
+                    "nonce" : "0xeae628a5c7e90df7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0946b27f236c38afb5c2d51cad3009a8ac0009d7a4468ee14e58d98946605f8b4888df3b2d066fcf9b9f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d9059bc2e00534194085b38190ecd891d0e4d7c6662f58567eadea71d7e18d2288eae628a5c7e90df7f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fac3221d8632df9bfcf7c189bedfec17e791f90ad6191bed40b42982447e9f2",
+        "lastblockhash" : "0x3fdfd84d75d9db4acfabacd1979ffff726714e9a9075ffd56dc2092f0b9791e3",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d12g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe74bf9366152917e5677eccca4c251a7b7ee53cbb7d33881ce9c0e230d8ad5ae",
-                    "mixHash" : "0xd3c234dfce071bdf53652f5bdd1f553b6e91569f84870c6f6b300c9d2f9b48c8",
-                    "nonce" : "0xfba84a00af82f63b",
+                    "hash" : "0x4cdc3d965cba3ca7e85190a1601970d42c79bcc4ee6ccbf396d6b8782acf4da6",
+                    "mixHash" : "0x93f2fd8b302986e2d6209a06d2467db8509842444aa8a5e91742b148ab0c728c",
+                    "nonce" : "0x263fad1934306df6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3c234dfce071bdf53652f5bdd1f553b6e91569f84870c6f6b300c9d2f9b48c888fba84a00af82f63bf85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a093f2fd8b302986e2d6209a06d2467db8509842444aa8a5e91742b148ab0c728c88263fad1934306df6f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe74bf9366152917e5677eccca4c251a7b7ee53cbb7d33881ce9c0e230d8ad5ae",
+        "lastblockhash" : "0x4cdc3d965cba3ca7e85190a1601970d42c79bcc4ee6ccbf396d6b8782acf4da6",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d12g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d12g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1a291c482715f0dfc16f715e9beb9b587e2d3dbbbad3a8588445911613e7c3cd",
-                    "mixHash" : "0x4b05ba59ee9d000c38d96a9908a575d76600a4b88e5392ba7be7171159477a31",
-                    "nonce" : "0x5a303e1c4d6bba7e",
+                    "hash" : "0x0ba21569b01f3995c162e2e0dc2ea781f84b3614b500d4a78a42ed8db813448f",
+                    "mixHash" : "0xe11bd5112e8df5b232e630e4f085a1ed668edeb6562e24f8c629aab2256b2e48",
+                    "nonce" : "0x35cdcdcf9f8736c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04b05ba59ee9d000c38d96a9908a575d76600a4b88e5392ba7be7171159477a31885a303e1c4d6bba7ef85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0019392393e7c17f7ac57e7f748a3486a23ee0ad2eecc568e19a945f0e4b0a91aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e11bd5112e8df5b232e630e4f085a1ed668edeb6562e24f8c629aab2256b2e488835cdcdcf9f8736c0f85ff85d800183061a8080830186a08e60016001600160012360006000f31ca046411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860eea0290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012360006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a291c482715f0dfc16f715e9beb9b587e2d3dbbbad3a8588445911613e7c3cd",
+        "lastblockhash" : "0x0ba21569b01f3995c162e2e0dc2ea781f84b3614b500d4a78a42ed8db813448f",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0.json
index bca7dfe5a..f65bf0c45 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d13g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4b5615be3b8b23a1cbf1f9672378c65ef6f86aee3b59dedab893ba8c190e368d",
-                    "mixHash" : "0xf8bb6b407489edd9ff536cf820becf189540781745920117690cb6b1fcc7af08",
-                    "nonce" : "0x98380d6d250ff1d3",
+                    "hash" : "0xc7020986dadb7736ee6f9eddc9678ca092c54132e3873c31d374de78b1c26c54",
+                    "mixHash" : "0x47a52974916649ce496182e88259375ef466a5b7d8c280b3ef37536f9427d283",
+                    "nonce" : "0x0c9164944ee8b2c5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f8bb6b407489edd9ff536cf820becf189540781745920117690cb6b1fcc7af088898380d6d250ff1d3f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a047a52974916649ce496182e88259375ef466a5b7d8c280b3ef37536f9427d283880c9164944ee8b2c5f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b5615be3b8b23a1cbf1f9672378c65ef6f86aee3b59dedab893ba8c190e368d",
+        "lastblockhash" : "0xc7020986dadb7736ee6f9eddc9678ca092c54132e3873c31d374de78b1c26c54",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d13g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc70b5026437f31eae4e53f74f1cd9b16425d8d19f6b53afb662e8167a14f0fc6",
-                    "mixHash" : "0xf95034b0103e31b5ffab29a03dc70bce01102f3ba738fa3a8a4aef45a2d0e803",
-                    "nonce" : "0xb89c43cc1c7244ef",
+                    "hash" : "0x979287b4bc83b1c831036d56e9887290b7581377351a5b2b47a298c08b803881",
+                    "mixHash" : "0x7e3dd1c00bda3a2be4e2ec147fe58d1256a30d89aec29f865e8e70044556ed3d",
+                    "nonce" : "0xc6f1854b43b2ec92",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f95034b0103e31b5ffab29a03dc70bce01102f3ba738fa3a8a4aef45a2d0e80388b89c43cc1c7244eff85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07e3dd1c00bda3a2be4e2ec147fe58d1256a30d89aec29f865e8e70044556ed3d88c6f1854b43b2ec92f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc70b5026437f31eae4e53f74f1cd9b16425d8d19f6b53afb662e8167a14f0fc6",
+        "lastblockhash" : "0x979287b4bc83b1c831036d56e9887290b7581377351a5b2b47a298c08b803881",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d13g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf8e81e6653e1c2d5707e5919cfb0f858dc935d82d684c54dc78893c8167ac71e",
-                    "mixHash" : "0xeae78695c77665bed1769da6f90ea0b883a54921805311dbfbd8207f66ee69a5",
-                    "nonce" : "0x8c423a16abe2b3a3",
+                    "hash" : "0x5289f355a996082bb07e82be5d61b9cb28ee22bd9ae08054ef4d89276edb55dc",
+                    "mixHash" : "0x287508f1ff7369b45b0da3b6c526fcecab0aa429d4a69dbf14d680de1e209da0",
+                    "nonce" : "0xb2a2233d06565234",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eae78695c77665bed1769da6f90ea0b883a54921805311dbfbd8207f66ee69a5888c423a16abe2b3a3f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0287508f1ff7369b45b0da3b6c526fcecab0aa429d4a69dbf14d680de1e209da088b2a2233d06565234f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8e81e6653e1c2d5707e5919cfb0f858dc935d82d684c54dc78893c8167ac71e",
+        "lastblockhash" : "0x5289f355a996082bb07e82be5d61b9cb28ee22bd9ae08054ef4d89276edb55dc",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d13g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf695752aead44725b73a8b0d3b8bdc28734741f196ab12882420f0752778e041",
-                    "mixHash" : "0x77e7b6e724e3abe2238b352c8458298a82814256607d84685ca9dfabb83b66fd",
-                    "nonce" : "0x683f75fb6db9884b",
+                    "hash" : "0xfca657383c78409d2fecfe61df82e45e39890fdb75bf51ae5d9073df97db2f4c",
+                    "mixHash" : "0x2f9bcda04853fcb71574f30a5675168a6c3b4209dd3eed702c338284b2b3a8ed",
+                    "nonce" : "0xc25b9705b351b6a9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a077e7b6e724e3abe2238b352c8458298a82814256607d84685ca9dfabb83b66fd88683f75fb6db9884bf85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02f9bcda04853fcb71574f30a5675168a6c3b4209dd3eed702c338284b2b3a8ed88c25b9705b351b6a9f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf695752aead44725b73a8b0d3b8bdc28734741f196ab12882420f0752778e041",
+        "lastblockhash" : "0xfca657383c78409d2fecfe61df82e45e39890fdb75bf51ae5d9073df97db2f4c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d13g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5c4c531bab8c03d23a0e8a12ad58048731a1c393aacd0c6c1498c7840c58a421",
-                    "mixHash" : "0xe02d06f6121355f0df2ea1b358171c3504b79e5c2a905f505e86bfb813f4726a",
-                    "nonce" : "0xe328da4b543105b3",
+                    "hash" : "0x4f4534388f3b6e1a89a6c660d568e484e579d50034ec88fbcb5c363c61de312f",
+                    "mixHash" : "0x51ce7432d17f690d3761f3d3996657acf1ba30719969024faf107200f29ac53a",
+                    "nonce" : "0x0e9d70ea20d44c4a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e02d06f6121355f0df2ea1b358171c3504b79e5c2a905f505e86bfb813f4726a88e328da4b543105b3f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a051ce7432d17f690d3761f3d3996657acf1ba30719969024faf107200f29ac53a880e9d70ea20d44c4af85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c4c531bab8c03d23a0e8a12ad58048731a1c393aacd0c6c1498c7840c58a421",
+        "lastblockhash" : "0x4f4534388f3b6e1a89a6c660d568e484e579d50034ec88fbcb5c363c61de312f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d13g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d13g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2f5d76f12a69ec8ab692e186057e03ab705e9f1f62d9e79bb640147ab478a39a",
-                    "mixHash" : "0xa5550e00eaf2315046ea4b6c4dc3cb6883cc151388b448e6a9224139a132b0ba",
-                    "nonce" : "0x846f7ede5e82f737",
+                    "hash" : "0xa6aec4826f58d45f8b4242bf0bf5f6b901e2a09fa15c627df5da11934cbd7d9b",
+                    "mixHash" : "0xf167f6f82df3ecb86c36d425c6eff71ce7034060a8d9a27cde6815313a363288",
+                    "nonce" : "0x8a746d15fbc1fb7d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a5550e00eaf2315046ea4b6c4dc3cb6883cc151388b448e6a9224139a132b0ba88846f7ede5e82f737f85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05aea53ff73858894788c0a78e60a69be8d023479de98a449b73eedab3ff24b6fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f167f6f82df3ecb86c36d425c6eff71ce7034060a8d9a27cde6815313a363288888a746d15fbc1fb7df85ff85d800183061a8080830186a08e60016001600160012460006000f31ca0bdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8dfa079d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012460006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f5d76f12a69ec8ab692e186057e03ab705e9f1f62d9e79bb640147ab478a39a",
+        "lastblockhash" : "0xa6aec4826f58d45f8b4242bf0bf5f6b901e2a09fa15c627df5da11934cbd7d9b",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0.json
index 442163694..6b897874c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d14g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x77dc932d241abd93ac1784648057b7665eb6af6f32f2f4cd35822c9d23b2aa94",
-                    "mixHash" : "0x27b3ec4cfe136a670be55442ae73e78a89ccc11642bf00b9eb1be558a92bdeb2",
-                    "nonce" : "0xd98d2abaa664b623",
+                    "hash" : "0xde186143a088492a7eb4560b19c9e8cad44736c6b75ae0d4856dd8655b55cd10",
+                    "mixHash" : "0xcbc97324c9d1c61802574d50263a5ea8aaf29ab4069327fff8ea724451f89539",
+                    "nonce" : "0x3614c1d6218c50bc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a027b3ec4cfe136a670be55442ae73e78a89ccc11642bf00b9eb1be558a92bdeb288d98d2abaa664b623f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cbc97324c9d1c61802574d50263a5ea8aaf29ab4069327fff8ea724451f89539883614c1d6218c50bcf85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77dc932d241abd93ac1784648057b7665eb6af6f32f2f4cd35822c9d23b2aa94",
+        "lastblockhash" : "0xde186143a088492a7eb4560b19c9e8cad44736c6b75ae0d4856dd8655b55cd10",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d14g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x696606eff6bb7ec58f8f877a2399439b199ab8b8b5d661edf485e4d710ae3ea4",
-                    "mixHash" : "0xef9fdfc0b4d984d82b4ae6b4be8678e22ff4f06471327d8a3253a1494796af96",
-                    "nonce" : "0xf97b248b4fc83711",
+                    "hash" : "0x7ce9a3021602489cbca1fd2c3f41e742c083d55f409440544594324a8688bc47",
+                    "mixHash" : "0x54c52c0d6229fc1009e0d20201185a060655740641907d8232d11f4077b5972b",
+                    "nonce" : "0x20a32e07bb67ef40",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef9fdfc0b4d984d82b4ae6b4be8678e22ff4f06471327d8a3253a1494796af9688f97b248b4fc83711f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a054c52c0d6229fc1009e0d20201185a060655740641907d8232d11f4077b5972b8820a32e07bb67ef40f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x696606eff6bb7ec58f8f877a2399439b199ab8b8b5d661edf485e4d710ae3ea4",
+        "lastblockhash" : "0x7ce9a3021602489cbca1fd2c3f41e742c083d55f409440544594324a8688bc47",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d14g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7fc84c65b845627dee690f8751f187153470b18bbe82bf6184e70ad43d091d66",
-                    "mixHash" : "0x44c9eb99dd58356894acb4a0e71ae5105be75ae30423f28d757b9e45a3e2e914",
-                    "nonce" : "0x6d3578d33b44da3d",
+                    "hash" : "0x922423954d596de92e539721375784b145bd02db40d6aeb7c7aa0ff537060e64",
+                    "mixHash" : "0x98b042aa8e918b5443f1ee39b343b71495edbddf56c133eac582843ae13a8ea1",
+                    "nonce" : "0xdd839f344c59b5db",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a044c9eb99dd58356894acb4a0e71ae5105be75ae30423f28d757b9e45a3e2e914886d3578d33b44da3df85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a098b042aa8e918b5443f1ee39b343b71495edbddf56c133eac582843ae13a8ea188dd839f344c59b5dbf85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7fc84c65b845627dee690f8751f187153470b18bbe82bf6184e70ad43d091d66",
+        "lastblockhash" : "0x922423954d596de92e539721375784b145bd02db40d6aeb7c7aa0ff537060e64",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d14g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb057969d4acd6129f8fc77ca6cfa3be78973d36f8ec422b3be2049ebf696e388",
-                    "mixHash" : "0x9c4e60026fb5ff44f6c3b68d4445ad52d7ca1c2ac776ca4596af34429d4d93d1",
-                    "nonce" : "0x052e4d82bfbbfc5c",
+                    "hash" : "0x0117960bf8cd28d46b065331e705413a56b5ed4edd0944d6d75ca0fe7e4fd71d",
+                    "mixHash" : "0x319680b3b0bc62bc58f7c46e460ef7cea04d480834d012ca42b025745e40353b",
+                    "nonce" : "0x8756e31bf57ec123",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09c4e60026fb5ff44f6c3b68d4445ad52d7ca1c2ac776ca4596af34429d4d93d188052e4d82bfbbfc5cf85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0319680b3b0bc62bc58f7c46e460ef7cea04d480834d012ca42b025745e40353b888756e31bf57ec123f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb057969d4acd6129f8fc77ca6cfa3be78973d36f8ec422b3be2049ebf696e388",
+        "lastblockhash" : "0x0117960bf8cd28d46b065331e705413a56b5ed4edd0944d6d75ca0fe7e4fd71d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d14g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x76ee1b2befa59402576feaeb624d22e906b8c1ae1eaa05dfc00f07ac79c1b81c",
-                    "mixHash" : "0xdf8bbfc9045380b6ea24d5b3c705e26bfe4c41954aa9ef6d9c11def0be191129",
-                    "nonce" : "0x904b8b4a617395a2",
+                    "hash" : "0x7ba5b3ec9fa54b2076eec8a35153a4e88bb16f1206073796b64b8b46a1aec65c",
+                    "mixHash" : "0x4599c4f6085b2e1f0c288a782b2bf63bd405a68de87027e6f8fcab2ed589c563",
+                    "nonce" : "0xb8e5e208659f8855",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0df8bbfc9045380b6ea24d5b3c705e26bfe4c41954aa9ef6d9c11def0be19112988904b8b4a617395a2f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04599c4f6085b2e1f0c288a782b2bf63bd405a68de87027e6f8fcab2ed589c56388b8e5e208659f8855f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76ee1b2befa59402576feaeb624d22e906b8c1ae1eaa05dfc00f07ac79c1b81c",
+        "lastblockhash" : "0x7ba5b3ec9fa54b2076eec8a35153a4e88bb16f1206073796b64b8b46a1aec65c",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d14g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d14g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcb0a7db768c7e0704aedb9420c4c2005e3a2a1329c71fd8b0f5c1afe33467cee",
-                    "mixHash" : "0x2c3cac5ec158daf25c27371867f795c3188587948877bffb115ddcf78949b981",
-                    "nonce" : "0x03c4f7fadd1005d5",
+                    "hash" : "0x6919afdd3ed609169919c9fdc81681a13916ce883977e4c5e2017ca95e78f43c",
+                    "mixHash" : "0xedad26437370ed01e10ae1f98b58817ea9c2b317e1c1178d4c2b97c0f0ff6a75",
+                    "nonce" : "0x4349d8fe3d9e1e87",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x04c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c3cac5ec158daf25c27371867f795c3188587948877bffb115ddcf78949b9818803c4f7fadd1005d5f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea004c625a931335fc48d62c74aba8c75779b7222be4588ed0526633d4719f8338da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0edad26437370ed01e10ae1f98b58817ea9c2b317e1c1178d4c2b97c0f0ff6a75884349d8fe3d9e1e87f85ff85d800183061a8080830186a08e60016001600160012560006000f31ba0a6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784a0757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3cc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb0a7db768c7e0704aedb9420c4c2005e3a2a1329c71fd8b0f5c1afe33467cee",
+        "lastblockhash" : "0x6919afdd3ed609169919c9fdc81681a13916ce883977e4c5e2017ca95e78f43c",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0.json
index f99550e44..14d3d232b 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d15g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0247f5044d025b0a63ef5f67b851c5748249d539957e932fcae6f02ff08341ec",
-                    "mixHash" : "0x98e4e445f292adaedfe36bd12b1522f37b51efea5518b77c5c93b297f469aa51",
-                    "nonce" : "0xf38480d491781a54",
+                    "hash" : "0x7f935833095d84834c69c632b1c4629564130db61923ee78596ccf2503e87262",
+                    "mixHash" : "0x33ea437750debd8ea787b85979e6fae3fb725c6675e12e91c76426cc73641250",
+                    "nonce" : "0x3df5f27866c5624f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a098e4e445f292adaedfe36bd12b1522f37b51efea5518b77c5c93b297f469aa5188f38480d491781a54f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a033ea437750debd8ea787b85979e6fae3fb725c6675e12e91c76426cc73641250883df5f27866c5624ff85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0247f5044d025b0a63ef5f67b851c5748249d539957e932fcae6f02ff08341ec",
+        "lastblockhash" : "0x7f935833095d84834c69c632b1c4629564130db61923ee78596ccf2503e87262",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d15g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf2951aa261f4dcb08319d1027e7f4204f86aafd98b4b5320485dfb7d1dfe36c6",
-                    "mixHash" : "0x134b747af4d4241fe09e2ce05abaeecdf2c8f5aecfed00a65540a4ae0c38f6a9",
-                    "nonce" : "0xa71b213d18d1a6b9",
+                    "hash" : "0x6ecfcf475d4b20c3585d48f5ac7d1dc9e4cc67abe86a323fb6ead330300241cd",
+                    "mixHash" : "0x0a564ccff0b788d54bb174f2d27ec3f3f55bad97d7ece3871a1d5ad48fe4b181",
+                    "nonce" : "0x8248e577e05d128b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0134b747af4d4241fe09e2ce05abaeecdf2c8f5aecfed00a65540a4ae0c38f6a988a71b213d18d1a6b9f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00a564ccff0b788d54bb174f2d27ec3f3f55bad97d7ece3871a1d5ad48fe4b181888248e577e05d128bf85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2951aa261f4dcb08319d1027e7f4204f86aafd98b4b5320485dfb7d1dfe36c6",
+        "lastblockhash" : "0x6ecfcf475d4b20c3585d48f5ac7d1dc9e4cc67abe86a323fb6ead330300241cd",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d15g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdbb3b0853523e5a26fcc508561bff6cda5feefdff0e035c3e82f3f3cc89c23f7",
-                    "mixHash" : "0x1dd37de1f4917896597a2f6f61ca7ca1248af80f03229763c2e5b656ee677d76",
-                    "nonce" : "0xef19e74919a6187f",
+                    "hash" : "0x0fe7cf30c01c1c0cfc5459fc932496ac8bac779631569fa8c2c45983f7750e84",
+                    "mixHash" : "0x6b3f7f425bd6fe959f235129db29b9094c6ef617693a72911222878bf8f8539b",
+                    "nonce" : "0x02a5010de512f950",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01dd37de1f4917896597a2f6f61ca7ca1248af80f03229763c2e5b656ee677d7688ef19e74919a6187ff85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06b3f7f425bd6fe959f235129db29b9094c6ef617693a72911222878bf8f8539b8802a5010de512f950f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbb3b0853523e5a26fcc508561bff6cda5feefdff0e035c3e82f3f3cc89c23f7",
+        "lastblockhash" : "0x0fe7cf30c01c1c0cfc5459fc932496ac8bac779631569fa8c2c45983f7750e84",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d15g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xce4852d97be021544ac067738c5b448be3cc1960fc37e5d26f2740e74fd7e04e",
-                    "mixHash" : "0x96297c26c87dac8023fa53fcb3890d3d22847a1215acf900d187d610a8d89075",
-                    "nonce" : "0xe1166a0da351ca5c",
+                    "hash" : "0x8de17ba0c661d7c421fd161063558d934bbf7891b1159417060952bd5c23185e",
+                    "mixHash" : "0x3261cd5021924afd0b8bf716e90ce2042b739a1f08ecf824672d1097f6891251",
+                    "nonce" : "0x087faf28cf16a4b9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a096297c26c87dac8023fa53fcb3890d3d22847a1215acf900d187d610a8d8907588e1166a0da351ca5cf85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03261cd5021924afd0b8bf716e90ce2042b739a1f08ecf824672d1097f689125188087faf28cf16a4b9f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce4852d97be021544ac067738c5b448be3cc1960fc37e5d26f2740e74fd7e04e",
+        "lastblockhash" : "0x8de17ba0c661d7c421fd161063558d934bbf7891b1159417060952bd5c23185e",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d15g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc1d70f6875c68f48d0f70e88d1d962e74facfe85cd960d8f227e951caacb8b12",
-                    "mixHash" : "0xeb508a66205672d31c6174734b44435e70f2071c7db7bbc2c4be6bc97d6471ae",
-                    "nonce" : "0x6fbc74c6c807e993",
+                    "hash" : "0x05875e59d2e55bafe9333d895e295ee5cb3946c5bda795fe53c6aead014664ee",
+                    "mixHash" : "0x27ea346adbd63bc4b98bd9868369f3c6701ee61c2e4eb7a9a91754c938459696",
+                    "nonce" : "0xaf3d8df46acc1803",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eb508a66205672d31c6174734b44435e70f2071c7db7bbc2c4be6bc97d6471ae886fbc74c6c807e993f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a027ea346adbd63bc4b98bd9868369f3c6701ee61c2e4eb7a9a91754c93845969688af3d8df46acc1803f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1d70f6875c68f48d0f70e88d1d962e74facfe85cd960d8f227e951caacb8b12",
+        "lastblockhash" : "0x05875e59d2e55bafe9333d895e295ee5cb3946c5bda795fe53c6aead014664ee",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d15g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d15g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7e44ff57e29c5461eb6c644a1bcbf7dbb256a47e71d4794415f3a5ed51ec516c",
-                    "mixHash" : "0x8830d00282fe8912df7ecc22b5796b91a7b9137caaccc708d96c07cc6bdd4e7e",
-                    "nonce" : "0x5883f132c6542857",
+                    "hash" : "0x86ae15e70aa5a83f9111c10c07b6e276ef7608a2b30239e8f2263f38d6814352",
+                    "mixHash" : "0xee134dbac01010c392bb53f681bb2d335aea8b42e2bd1affdbceea0ab1e7e0e6",
+                    "nonce" : "0x128a966c0e0369de",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x7ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08830d00282fe8912df7ecc22b5796b91a7b9137caaccc708d96c07cc6bdd4e7e885883f132c6542857f85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07ebcdabc5c1cf8d0a59113d283c71bb54b9718ae47f7196af9c8f22fc30504e4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ee134dbac01010c392bb53f681bb2d335aea8b42e2bd1affdbceea0ab1e7e0e688128a966c0e0369def85ff85d800183061a8080830186a08e60016001600160012660006000f31ba0135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460a01e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e44ff57e29c5461eb6c644a1bcbf7dbb256a47e71d4794415f3a5ed51ec516c",
+        "lastblockhash" : "0x86ae15e70aa5a83f9111c10c07b6e276ef7608a2b30239e8f2263f38d6814352",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0.json
index 6cf1ce2cc..7ef9b3ab2 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d16g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x193fd52c8070df1f3e9a3f697381b34a00823676ce74b91f0392631b7f9a4c60",
-                    "mixHash" : "0x927acc560fafcd48bb9f9913e3d8369d0d9fc1281fa438230318e74984690681",
-                    "nonce" : "0xfb838061b93ca0e7",
+                    "hash" : "0xf827887eabe90b97b9a9062e1bf008d8e4d13a75c641cfa7bc79cb209090367a",
+                    "mixHash" : "0xa9856a318fa32b67a6718f86d20b160be553d8f0a224cf6782174fbecd8ea709",
+                    "nonce" : "0xad8905265a3c6a76",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0927acc560fafcd48bb9f9913e3d8369d0d9fc1281fa438230318e7498469068188fb838061b93ca0e7f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a9856a318fa32b67a6718f86d20b160be553d8f0a224cf6782174fbecd8ea70988ad8905265a3c6a76f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x193fd52c8070df1f3e9a3f697381b34a00823676ce74b91f0392631b7f9a4c60",
+        "lastblockhash" : "0xf827887eabe90b97b9a9062e1bf008d8e4d13a75c641cfa7bc79cb209090367a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d16g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x53cd3dcc4453f396bba0caabe1ef8c75fb33f345db724a91a27aafd3622e57b0",
-                    "mixHash" : "0x80d04f51ee09be228e04760f5f6a2f7918ae0c001c37bdf7aa1cd0d91c0758a5",
-                    "nonce" : "0x97b39a89e207616b",
+                    "hash" : "0xa1fc78ac14187b419eb680c2d60dfa4f6bec3d1bbe6da09fe2188d921f24df4f",
+                    "mixHash" : "0x9a99cf08664478b85354ec374d2c9d3b66010dd80fa2c95500e591337e105e0f",
+                    "nonce" : "0x00d9148fc22598f3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a080d04f51ee09be228e04760f5f6a2f7918ae0c001c37bdf7aa1cd0d91c0758a58897b39a89e207616bf85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09a99cf08664478b85354ec374d2c9d3b66010dd80fa2c95500e591337e105e0f8800d9148fc22598f3f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53cd3dcc4453f396bba0caabe1ef8c75fb33f345db724a91a27aafd3622e57b0",
+        "lastblockhash" : "0xa1fc78ac14187b419eb680c2d60dfa4f6bec3d1bbe6da09fe2188d921f24df4f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d16g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb5ddff49bbac0d295718782faeee577fa246d2c37587cd8d9b3a97c8607b4068",
-                    "mixHash" : "0x752d59d2f3d573a5de02796985a6222ff0827d2fba7e8e571f6d20213a9ab9fe",
-                    "nonce" : "0xefe05fa2e9b5d37b",
+                    "hash" : "0x9c316aca9b594e9ef884661097df001e4fe37e70ec48bcca251fa310f1ed3bf6",
+                    "mixHash" : "0x559d8542c19ad6746ebdce369d40fe02c6b85ef342a9b43ae14d8d754aae1592",
+                    "nonce" : "0x71cef1867edda530",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0752d59d2f3d573a5de02796985a6222ff0827d2fba7e8e571f6d20213a9ab9fe88efe05fa2e9b5d37bf85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0559d8542c19ad6746ebdce369d40fe02c6b85ef342a9b43ae14d8d754aae15928871cef1867edda530f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5ddff49bbac0d295718782faeee577fa246d2c37587cd8d9b3a97c8607b4068",
+        "lastblockhash" : "0x9c316aca9b594e9ef884661097df001e4fe37e70ec48bcca251fa310f1ed3bf6",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d16g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbe99ad5de748b1d36bc83a6dc71b8dffce5eae6f07f0d896e0af06d456b5c707",
-                    "mixHash" : "0xeae126698f1403b4a4cbb5e1c79fb73efaa4e163276c3fcf3c907e2666564245",
-                    "nonce" : "0x55c6ca68e518f279",
+                    "hash" : "0xc4ce511e66556d7014ce6295a35bd38d8755ea75f703f6b3e5232a0839c64107",
+                    "mixHash" : "0x97b7b7d01d74faacde3c3e217bdcbdd45bfe4c17dbbe1d44c4168be749b4256d",
+                    "nonce" : "0x148c0fbdc9fcb73e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eae126698f1403b4a4cbb5e1c79fb73efaa4e163276c3fcf3c907e26665642458855c6ca68e518f279f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a097b7b7d01d74faacde3c3e217bdcbdd45bfe4c17dbbe1d44c4168be749b4256d88148c0fbdc9fcb73ef85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe99ad5de748b1d36bc83a6dc71b8dffce5eae6f07f0d896e0af06d456b5c707",
+        "lastblockhash" : "0xc4ce511e66556d7014ce6295a35bd38d8755ea75f703f6b3e5232a0839c64107",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d16g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x00e53e13d71cb9a34f0f2c9297966d789a308d26df1115a8c33a0ffdd1c32a07",
-                    "mixHash" : "0x32c4c2a000faec2c5eface961a435c59c450045cede222798241985678f5a8f4",
-                    "nonce" : "0x528b372875394001",
+                    "hash" : "0x0d98f09eea16cff0830454858ea5ddf2a234b5c879501e7233e8b34eab984b6d",
+                    "mixHash" : "0xaa7dbd26ec6fe8e344139ba8fdbc053b52b664447318db0ee0c7d548e12df758",
+                    "nonce" : "0xfe2fcc61ad9d7e02",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032c4c2a000faec2c5eface961a435c59c450045cede222798241985678f5a8f488528b372875394001f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aa7dbd26ec6fe8e344139ba8fdbc053b52b664447318db0ee0c7d548e12df75888fe2fcc61ad9d7e02f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00e53e13d71cb9a34f0f2c9297966d789a308d26df1115a8c33a0ffdd1c32a07",
+        "lastblockhash" : "0x0d98f09eea16cff0830454858ea5ddf2a234b5c879501e7233e8b34eab984b6d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d16g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d16g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe17582a226dd3dce6957954fe928c43ab32fea6a16d5dec9d39148ee21e1b2c0",
-                    "mixHash" : "0xace9420baa166da54260e7e6ac2cf2357d98c8f732d6ba3e78bfbac185c19673",
-                    "nonce" : "0xf1ce329c86c396a4",
+                    "hash" : "0x5f3df54d005a3cadd69c18d3480e483f40723b12baa66e3fa5302fa001455b02",
+                    "mixHash" : "0xbb4fae35c83ecb98c494dd5f68e22981f1edbbb22bfe5e842c92424d35d5260a",
+                    "nonce" : "0xf32f6e3d19d3b6d3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x64631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ace9420baa166da54260e7e6ac2cf2357d98c8f732d6ba3e78bfbac185c1967388f1ce329c86c396a4f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064631af60174087e2291ce96936d943014d80e1c0a9262d89e8abe3f76820ea5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb4fae35c83ecb98c494dd5f68e22981f1edbbb22bfe5e842c92424d35d5260a88f32f6e3d19d3b6d3f85ff85d800183061a8080830186a08e60016001600160012760006000f31ca0a214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992a0737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038ddc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe17582a226dd3dce6957954fe928c43ab32fea6a16d5dec9d39148ee21e1b2c0",
+        "lastblockhash" : "0x5f3df54d005a3cadd69c18d3480e483f40723b12baa66e3fa5302fa001455b02",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0.json
index 2a3123d38..744f43cc4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d17g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x26525482c68ef5493a79c552b4bc64ecc31fa659de9145391d3aec76b88c0cd5",
-                    "mixHash" : "0x783f492e9f1bf21a019af73cde8f7f38b740985d51bc09bb4f6d99604675a5a9",
-                    "nonce" : "0xac1254fce13a967a",
+                    "hash" : "0xff5a61a14b7b2eb5f061ac4659b06423d31586c7df5ebc50d13355ba65c8234c",
+                    "mixHash" : "0x353b948007eb28c9f0ba9f1269f986eb5544e8b6b99abec075c50b712395b046",
+                    "nonce" : "0xf70435699e6cf8e3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0783f492e9f1bf21a019af73cde8f7f38b740985d51bc09bb4f6d99604675a5a988ac1254fce13a967af85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0353b948007eb28c9f0ba9f1269f986eb5544e8b6b99abec075c50b712395b04688f70435699e6cf8e3f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26525482c68ef5493a79c552b4bc64ecc31fa659de9145391d3aec76b88c0cd5",
+        "lastblockhash" : "0xff5a61a14b7b2eb5f061ac4659b06423d31586c7df5ebc50d13355ba65c8234c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d17g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3a3c1c782df3218fb8a58b5aa0dc8e15f33f8dadda4cc66a5f36cb55a460f07a",
-                    "mixHash" : "0x9f18240ee2bad4e3862949af4422cd07708bd9806e9b00278ad0eb367238e9a1",
-                    "nonce" : "0xcc8044ec24749a3a",
+                    "hash" : "0xa6aff415d4eefb68db1e915f3790afadb481411e261eccd4ad35fb076e5b033c",
+                    "mixHash" : "0x14dc89c3a55b23ab54d3d9ef08e1244d0b02a809401bc07861b059125cb13e16",
+                    "nonce" : "0x74e4e09b27bed197",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09f18240ee2bad4e3862949af4422cd07708bd9806e9b00278ad0eb367238e9a188cc8044ec24749a3af85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a014dc89c3a55b23ab54d3d9ef08e1244d0b02a809401bc07861b059125cb13e168874e4e09b27bed197f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a3c1c782df3218fb8a58b5aa0dc8e15f33f8dadda4cc66a5f36cb55a460f07a",
+        "lastblockhash" : "0xa6aff415d4eefb68db1e915f3790afadb481411e261eccd4ad35fb076e5b033c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d17g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x51dd60396f670a61f39e006779c761074af702d62fb644c4790cdaaa4a952eef",
-                    "mixHash" : "0xa8a55052e9ea56653a5c7000f62bc3872d3c0541e06f9f44a5adb34103ec4035",
-                    "nonce" : "0xfdfc5f94d2d1895c",
+                    "hash" : "0x444d5db32bf3a1391a06e306365bd2b795fdb768c25afef330715787b5c69b08",
+                    "mixHash" : "0xd7aaaac01e32c5d778317f713e06e2b340e439c58f3a2ba9af3e81e65ef3f7b1",
+                    "nonce" : "0x19fd2d8e824426ee",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a8a55052e9ea56653a5c7000f62bc3872d3c0541e06f9f44a5adb34103ec403588fdfc5f94d2d1895cf85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d7aaaac01e32c5d778317f713e06e2b340e439c58f3a2ba9af3e81e65ef3f7b18819fd2d8e824426eef85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51dd60396f670a61f39e006779c761074af702d62fb644c4790cdaaa4a952eef",
+        "lastblockhash" : "0x444d5db32bf3a1391a06e306365bd2b795fdb768c25afef330715787b5c69b08",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d17g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x21d55c96f6ede145a8844ddfca61488f6b2b225f8d7ec8027f56a2652d50ddf3",
-                    "mixHash" : "0x79adf838480395e8f66220d3b536a088e74565d7b3794983d4d30e50336da0aa",
-                    "nonce" : "0xe02c38340a417340",
+                    "hash" : "0xf5cfa7fbc83368c17e2e7944e8abb316dfcdac9b5b95054ecc2089c000427d47",
+                    "mixHash" : "0x2ad9c1a5b8f36738e5c1d34f08892e399f8fe5111e17feb423a5439922fe617b",
+                    "nonce" : "0x6f8bfd26c3b7ab5f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a079adf838480395e8f66220d3b536a088e74565d7b3794983d4d30e50336da0aa88e02c38340a417340f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ad9c1a5b8f36738e5c1d34f08892e399f8fe5111e17feb423a5439922fe617b886f8bfd26c3b7ab5ff85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21d55c96f6ede145a8844ddfca61488f6b2b225f8d7ec8027f56a2652d50ddf3",
+        "lastblockhash" : "0xf5cfa7fbc83368c17e2e7944e8abb316dfcdac9b5b95054ecc2089c000427d47",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d17g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1b7fe819341c8cc2fe469514bd7a7c22ad36400d13ae4b62b746814bd05a6b11",
-                    "mixHash" : "0x0e37656f82c8e908d0bdbd93264b7e5e2d8a41af01bd2104178d7371498e9b43",
-                    "nonce" : "0x8f64fe4f6a960324",
+                    "hash" : "0x4f3e485590d9e1bd754c9f97e4bc24c0ed177e05583ceb19ad1a39a44457fef6",
+                    "mixHash" : "0xede5ce50ec1c1a3a8dc1a0c109bac1efc6718795e97a6c4b7154320b843bf2d0",
+                    "nonce" : "0xaa157eb705c07ac9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00e37656f82c8e908d0bdbd93264b7e5e2d8a41af01bd2104178d7371498e9b43888f64fe4f6a960324f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ede5ce50ec1c1a3a8dc1a0c109bac1efc6718795e97a6c4b7154320b843bf2d088aa157eb705c07ac9f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b7fe819341c8cc2fe469514bd7a7c22ad36400d13ae4b62b746814bd05a6b11",
+        "lastblockhash" : "0x4f3e485590d9e1bd754c9f97e4bc24c0ed177e05583ceb19ad1a39a44457fef6",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d17g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d17g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd4472ad8cca4371c48f16057b5a8a2c9d996323d915102a8dedb39757bf4a89b",
-                    "mixHash" : "0x02cb9ce9c0a87f5f4b4ac6d37fa2615069d8a703ebcc44185825fd1d734f0d77",
-                    "nonce" : "0xcfc64b8a91ecd3a2",
+                    "hash" : "0x0b463239a6dcbd980ee55f15d164fe6b8db9a1f370536f67f1d5c70b81d8f621",
+                    "mixHash" : "0xcd24e419f67afbd990467816af692b6a3b7b3dc0017c071a878b8d739a01520d",
+                    "nonce" : "0xf2c131354787476d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002cb9ce9c0a87f5f4b4ac6d37fa2615069d8a703ebcc44185825fd1d734f0d7788cfc64b8a91ecd3a2f85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0194db1aaf05ed1b548e279fe7678bfa8cfa2a497ac17e2fb32844fc91cf4669ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cd24e419f67afbd990467816af692b6a3b7b3dc0017c071a878b8d739a01520d88f2c131354787476df85ff85d800183061a8080830186a08e60016001600160012860006000f31ca0df0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92a0163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4472ad8cca4371c48f16057b5a8a2c9d996323d915102a8dedb39757bf4a89b",
+        "lastblockhash" : "0x0b463239a6dcbd980ee55f15d164fe6b8db9a1f370536f67f1d5c70b81d8f621",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0.json
index ae988d76a..e4b7c6e3d 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d18g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xff552c07ac369d893709da8c6b81d20dda47ee819e679caf73dcce5eac0455a4",
-                    "mixHash" : "0xfd7c6b9cba3c2c1dc8e84de8a670d2efe770805f0229de64c906ad8da2d4061c",
-                    "nonce" : "0x2b8aa0a4b5d376b2",
+                    "hash" : "0x637da03f3e225ddf9d3bffbbef794315883d08f7c0357830a88f47c0caa7f9bf",
+                    "mixHash" : "0xaf91af9d3ecd093cdf9e26a16b2d61bc1e898cb2786269c166406c6858d68f0a",
+                    "nonce" : "0x91272669151da0d0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fd7c6b9cba3c2c1dc8e84de8a670d2efe770805f0229de64c906ad8da2d4061c882b8aa0a4b5d376b2f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0af91af9d3ecd093cdf9e26a16b2d61bc1e898cb2786269c166406c6858d68f0a8891272669151da0d0f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff552c07ac369d893709da8c6b81d20dda47ee819e679caf73dcce5eac0455a4",
+        "lastblockhash" : "0x637da03f3e225ddf9d3bffbbef794315883d08f7c0357830a88f47c0caa7f9bf",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d18g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3e3040379a330b24f29464f5ede98e4c24516e5df90562b62946b7ea093494d5",
-                    "mixHash" : "0x13d8200ec09f28607c63e201d739f622883b92059b8a870bcdd499f6a55c16f9",
-                    "nonce" : "0xf63c9f4731b5dd89",
+                    "hash" : "0xd0e1dfa5819e68af0e264afe5d53b1abc9e827eb7c1819d6874d6be44779ea9b",
+                    "mixHash" : "0xefe5ce8ccb29ee7662d2af603f0cadc7f10deb64dd94c8d22e4fcad2b133b3b9",
+                    "nonce" : "0x34a07642574673e4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a013d8200ec09f28607c63e201d739f622883b92059b8a870bcdd499f6a55c16f988f63c9f4731b5dd89f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0efe5ce8ccb29ee7662d2af603f0cadc7f10deb64dd94c8d22e4fcad2b133b3b98834a07642574673e4f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e3040379a330b24f29464f5ede98e4c24516e5df90562b62946b7ea093494d5",
+        "lastblockhash" : "0xd0e1dfa5819e68af0e264afe5d53b1abc9e827eb7c1819d6874d6be44779ea9b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d18g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbd8a18f678b4dc126035413780495bef4e53cd397cebb60ead146750589414e0",
-                    "mixHash" : "0x6ec9fc205eaa8dc5177987c212b0386b1e1322ebb4b0328b8ccfb78234b48a1e",
-                    "nonce" : "0xbdc15cc5c155cbe4",
+                    "hash" : "0x7dc362d3b5ec80a9a559fa52e702c0335154776b2dd9342934e5ccb2d7037d61",
+                    "mixHash" : "0xde40fe26168427f4d5c4d0c0db782d4a2c7dbe42412306e922f8d29392879af1",
+                    "nonce" : "0x3bf3784e7c65b4b5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ec9fc205eaa8dc5177987c212b0386b1e1322ebb4b0328b8ccfb78234b48a1e88bdc15cc5c155cbe4f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0de40fe26168427f4d5c4d0c0db782d4a2c7dbe42412306e922f8d29392879af1883bf3784e7c65b4b5f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd8a18f678b4dc126035413780495bef4e53cd397cebb60ead146750589414e0",
+        "lastblockhash" : "0x7dc362d3b5ec80a9a559fa52e702c0335154776b2dd9342934e5ccb2d7037d61",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d18g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6d65723ad1d760160d3bf7dbc6a61d64ce06ee2ece0687af6c0e8e7fee9e33d7",
-                    "mixHash" : "0xc9472472c2803c492f789e7386264b8caa28125e50097ddf36f339dbe77b1853",
-                    "nonce" : "0x00253cb61990aee7",
+                    "hash" : "0xa5c1acbce5023f2e6d4334b46b8091562ec30cd521fa2386b0c0c89f84512ed5",
+                    "mixHash" : "0x82282eb10cb0ddd9d509e8bbf43f045df1b6094438f9d7ab66bc7a5f13b073bd",
+                    "nonce" : "0xb591c432e6236daa",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c9472472c2803c492f789e7386264b8caa28125e50097ddf36f339dbe77b18538800253cb61990aee7f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082282eb10cb0ddd9d509e8bbf43f045df1b6094438f9d7ab66bc7a5f13b073bd88b591c432e6236daaf85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d65723ad1d760160d3bf7dbc6a61d64ce06ee2ece0687af6c0e8e7fee9e33d7",
+        "lastblockhash" : "0xa5c1acbce5023f2e6d4334b46b8091562ec30cd521fa2386b0c0c89f84512ed5",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d18g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xad6e80c9829fc1b418b44eb3ee2737e4cf3b0b792d1f1992225b338ffdbf124e",
-                    "mixHash" : "0x4b0afceeac991ba54047335c8425136aba8ad5144e32f9c46c93de6252730eda",
-                    "nonce" : "0x50fdb02d8bc55fdb",
+                    "hash" : "0xc8c9a72c295da8fa94553f76180477ad6bac31624bbee5f17c0a9bc77a17afb1",
+                    "mixHash" : "0xc88b5a1f5a7eb8b52d61b2fdd07697132e55ed8602de36629663e246f458c546",
+                    "nonce" : "0x76456346f03b07df",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04b0afceeac991ba54047335c8425136aba8ad5144e32f9c46c93de6252730eda8850fdb02d8bc55fdbf85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c88b5a1f5a7eb8b52d61b2fdd07697132e55ed8602de36629663e246f458c5468876456346f03b07dff85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad6e80c9829fc1b418b44eb3ee2737e4cf3b0b792d1f1992225b338ffdbf124e",
+        "lastblockhash" : "0xc8c9a72c295da8fa94553f76180477ad6bac31624bbee5f17c0a9bc77a17afb1",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d18g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d18g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0c7b8434028df23f6c329d22e1a9d5626129fbb838b5338a6d49ee912741a238",
-                    "mixHash" : "0x05614ee302d3db459cc1f9bd35aaa0c85dd74b576da8e0bc84ef51cff6ff25df",
-                    "nonce" : "0xc0886ec1b37c6c29",
+                    "hash" : "0x312fd04a1b1a833e8f1c6cb279422c5808c5030e6924cece8b2a09440ec08bd4",
+                    "mixHash" : "0xe5f2cab8f8ca94d0327b8038416603d48ca76482ddfc4dab974193ac5c1e6871",
+                    "nonce" : "0x122077bb8c077ef9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x6da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a005614ee302d3db459cc1f9bd35aaa0c85dd74b576da8e0bc84ef51cff6ff25df88c0886ec1b37c6c29f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06da9268b108c9700f0268d4021281c42ffef7f033eaf7c1f66ab3caa73a1351ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e5f2cab8f8ca94d0327b8038416603d48ca76482ddfc4dab974193ac5c1e687188122077bb8c077ef9f85ff85d800183061a8080830186a08e60016001600160012960006000f31ca020c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0a031309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c7b8434028df23f6c329d22e1a9d5626129fbb838b5338a6d49ee912741a238",
+        "lastblockhash" : "0x312fd04a1b1a833e8f1c6cb279422c5808c5030e6924cece8b2a09440ec08bd4",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0.json
index 6e4b2f7ba..fb2fd2adc 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d19g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3dfb6cc7e1e7290b663b7547e72bc14fa00f7186c8a6acc0a8477ea01bb7b187",
-                    "mixHash" : "0xcf4cdb84296399ac18d3d45f0b1593663719eef6271cb2fe76471b2f8fe368be",
-                    "nonce" : "0xbede93801dc22160",
+                    "hash" : "0x31a365df05523d5e03a980558e5fa475c7e38ef2d57a177e8468f5cd8ebf803c",
+                    "mixHash" : "0x3de354f8fbe49a5ea4b499bb586134bedd8f3356369ec01275ea9973ef890c0a",
+                    "nonce" : "0x22ee5b312b23edfc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cf4cdb84296399ac18d3d45f0b1593663719eef6271cb2fe76471b2f8fe368be88bede93801dc22160f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03de354f8fbe49a5ea4b499bb586134bedd8f3356369ec01275ea9973ef890c0a8822ee5b312b23edfcf85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3dfb6cc7e1e7290b663b7547e72bc14fa00f7186c8a6acc0a8477ea01bb7b187",
+        "lastblockhash" : "0x31a365df05523d5e03a980558e5fa475c7e38ef2d57a177e8468f5cd8ebf803c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d19g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x721e52aa0e6b47d3c5f8bf6b9ba73d45340da4a4455809afba5f83a159a44638",
-                    "mixHash" : "0x1a2adcd5a6e26982a44c5ea602ad2a51c0068326f0491d3cebac3cdaf3d50dfd",
-                    "nonce" : "0x2a92d3c8214c21d6",
+                    "hash" : "0x6978903d3dd6125783993b39a009eba05e064e5b641b8ab645d888dbe2a5ce95",
+                    "mixHash" : "0x4fd4c09c3061cf6bef9cbb2a56f3b1db615d585dc3e993239b59a5191f1eeaeb",
+                    "nonce" : "0x19bc98f16d3e7cf5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01a2adcd5a6e26982a44c5ea602ad2a51c0068326f0491d3cebac3cdaf3d50dfd882a92d3c8214c21d6f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04fd4c09c3061cf6bef9cbb2a56f3b1db615d585dc3e993239b59a5191f1eeaeb8819bc98f16d3e7cf5f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x721e52aa0e6b47d3c5f8bf6b9ba73d45340da4a4455809afba5f83a159a44638",
+        "lastblockhash" : "0x6978903d3dd6125783993b39a009eba05e064e5b641b8ab645d888dbe2a5ce95",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d19g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8bfe0333054b2dd41cbc6c5891c73c9356ad7b7532d3201d1b299382de4974b3",
-                    "mixHash" : "0xcc9c0f313eba470c6617de3d906f94a4d562afb5feef2a280e7dff2c4a4d08fe",
-                    "nonce" : "0x6871dfcabfe967d5",
+                    "hash" : "0x22bfe2787eabacc2c366d1b4f6999274f0515d06b1c442bb7744c437b137eed5",
+                    "mixHash" : "0x2ee862de4f2a2e04b521164bf7aa10572d0bd9c541f3db0af5d8c7f7e2b5d779",
+                    "nonce" : "0x34107a06e0b79898",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cc9c0f313eba470c6617de3d906f94a4d562afb5feef2a280e7dff2c4a4d08fe886871dfcabfe967d5f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ee862de4f2a2e04b521164bf7aa10572d0bd9c541f3db0af5d8c7f7e2b5d7798834107a06e0b79898f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bfe0333054b2dd41cbc6c5891c73c9356ad7b7532d3201d1b299382de4974b3",
+        "lastblockhash" : "0x22bfe2787eabacc2c366d1b4f6999274f0515d06b1c442bb7744c437b137eed5",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d19g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x168c33d80bf5295d12a7820a53de751b5a92fa95cd3e9478d487bfa492bd9c04",
-                    "mixHash" : "0x52120f1d750c24ecdadcfe0b6cc3c67e69fcaa89e70b780fac09e9e3254ce009",
-                    "nonce" : "0xd05d1dfb79e46022",
+                    "hash" : "0x48e64a104b380ce4581598561da47296dc3106e81fc118caea9473e6e2e0dc28",
+                    "mixHash" : "0x487f241018292333ab051e8005a4aec8fe1fecc44f4b41d3ab492c0477a9da70",
+                    "nonce" : "0x0fc6448ad71dabb5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052120f1d750c24ecdadcfe0b6cc3c67e69fcaa89e70b780fac09e9e3254ce00988d05d1dfb79e46022f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0487f241018292333ab051e8005a4aec8fe1fecc44f4b41d3ab492c0477a9da70880fc6448ad71dabb5f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x168c33d80bf5295d12a7820a53de751b5a92fa95cd3e9478d487bfa492bd9c04",
+        "lastblockhash" : "0x48e64a104b380ce4581598561da47296dc3106e81fc118caea9473e6e2e0dc28",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d19g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x764dec667bce730d2d636c3bd2fa9129887ed7ef3b64c795511a56325244cff5",
-                    "mixHash" : "0x50831263f8ed2a65e705b4bf3a5cd1ef9a491ca9638f385925a3d131de38471f",
-                    "nonce" : "0x0b104c454f4c4acf",
+                    "hash" : "0x1e402afdeb38dec1c2aef21929988af2448ff6f803320c1c044d2035bf4203e1",
+                    "mixHash" : "0xfb7089381b15320ccf3c52cc1c69f1b93674e771167f7db803b7da4f115b9500",
+                    "nonce" : "0xda226ed1f74f73c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a050831263f8ed2a65e705b4bf3a5cd1ef9a491ca9638f385925a3d131de38471f880b104c454f4c4acff85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb7089381b15320ccf3c52cc1c69f1b93674e771167f7db803b7da4f115b950088da226ed1f74f73c0f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x764dec667bce730d2d636c3bd2fa9129887ed7ef3b64c795511a56325244cff5",
+        "lastblockhash" : "0x1e402afdeb38dec1c2aef21929988af2448ff6f803320c1c044d2035bf4203e1",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d19g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d19g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf0fbf96ca1e2f1edd8634a08564cd5a65dbc0f2e1bf6de6a9699aeea3986ad46",
-                    "mixHash" : "0x335073896e00daa088273bb063fd0782223305a735193a14e12fbbce9d905bb0",
-                    "nonce" : "0xe9b9dca2c6ee859a",
+                    "hash" : "0x7da39be061c930d12b78485786d6710667518b5b5cf590673551709d40890ed7",
+                    "mixHash" : "0xe30a16d372b35839bc484d02a9d92135988e4c64ec4163f5ad36306847e9db45",
+                    "nonce" : "0x73ffe408c25ddad3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0335073896e00daa088273bb063fd0782223305a735193a14e12fbbce9d905bb088e9b9dca2c6ee859af85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03365b086445c75cf91e0e3ceb9d965d3e70beee166ff7c68aa8563e08a4f20d8a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e30a16d372b35839bc484d02a9d92135988e4c64ec4163f5ad36306847e9db458873ffe408c25ddad3f85ff85d800183061a8080830186a08e60016001600160012a60006000f31ca03053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5faa057147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012a60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0fbf96ca1e2f1edd8634a08564cd5a65dbc0f2e1bf6de6a9699aeea3986ad46",
+        "lastblockhash" : "0x7da39be061c930d12b78485786d6710667518b5b5cf590673551709d40890ed7",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0.json
index c1b2f6570..c50d79f5d 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7d216cbdcbf2afa7d42f52d62d7b692c27193a8f90db82303a22fde3b14da40e",
-                    "mixHash" : "0xa7429ad9db37f57d2d989244992e07fb9eea06b02250dd3071fe1b249b613457",
-                    "nonce" : "0x9d4bab8390a5f229",
+                    "hash" : "0x406a04b668598d8f8407df2732938c77cac8b1df13b8ef0902c47d99addca7cd",
+                    "mixHash" : "0x96d91e4b3da78cae686d1c528c4960b437502de899052bd9019999a4877e1c9e",
+                    "nonce" : "0x7006d8d8048db77f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a7429ad9db37f57d2d989244992e07fb9eea06b02250dd3071fe1b249b613457889d4bab8390a5f229f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a096d91e4b3da78cae686d1c528c4960b437502de899052bd9019999a4877e1c9e887006d8d8048db77ff85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d216cbdcbf2afa7d42f52d62d7b692c27193a8f90db82303a22fde3b14da40e",
+        "lastblockhash" : "0x406a04b668598d8f8407df2732938c77cac8b1df13b8ef0902c47d99addca7cd",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x26294dac41c864e7f0457308254a8eea5697f48e79283b698c64c648e0a06dfe",
-                    "mixHash" : "0xdd12154d97c29b576dd35ec3935fd9ff0fd74f56182c927a29f8414659118b32",
-                    "nonce" : "0x63dce171b246440a",
+                    "hash" : "0x9cf2e9ba3446fbdd3d8f0b307dddbcaff9b360a3f3c27897a25c4f2d5eb316ec",
+                    "mixHash" : "0xf90362856306e982f69ffda234abbd7b6e3d7a172c7933730b4f2e04128250a2",
+                    "nonce" : "0xecd287a8483fcb91",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dd12154d97c29b576dd35ec3935fd9ff0fd74f56182c927a29f8414659118b328863dce171b246440af85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f90362856306e982f69ffda234abbd7b6e3d7a172c7933730b4f2e04128250a288ecd287a8483fcb91f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26294dac41c864e7f0457308254a8eea5697f48e79283b698c64c648e0a06dfe",
+        "lastblockhash" : "0x9cf2e9ba3446fbdd3d8f0b307dddbcaff9b360a3f3c27897a25c4f2d5eb316ec",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x27c080c5429897f461e45597765dd79f67a1f92b39257b7a19f9736fde55d257",
-                    "mixHash" : "0xab7cf9c0713381d962f01bc618bc4777d1e5178f0494f4f1907dc7a634104966",
-                    "nonce" : "0x3b815da1b615c2ef",
+                    "hash" : "0x2975772aeaf4624e835ba8f0a622d375f7da30581a43306cf291a3bdb2669b42",
+                    "mixHash" : "0x5bd6d2bd7a41e39249de0b42af4ec9e9269539b04f7b1a4607c1c06ca7d9429e",
+                    "nonce" : "0x8dedb3747a6eb014",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab7cf9c0713381d962f01bc618bc4777d1e5178f0494f4f1907dc7a634104966883b815da1b615c2eff85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05bd6d2bd7a41e39249de0b42af4ec9e9269539b04f7b1a4607c1c06ca7d9429e888dedb3747a6eb014f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27c080c5429897f461e45597765dd79f67a1f92b39257b7a19f9736fde55d257",
+        "lastblockhash" : "0x2975772aeaf4624e835ba8f0a622d375f7da30581a43306cf291a3bdb2669b42",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x782256de08b33a7bbd9b8d756c3f80cf22d36c8011b7272bfbe5f786e6694e4f",
-                    "mixHash" : "0x529cbd1ffb8e91ad0a371ba2539613d424b6d5114a7bb6ceab3ef8fde3748598",
-                    "nonce" : "0xc6c6e53699f53408",
+                    "hash" : "0xe0e6da34b1479e6f74b84b397fe539645c64efda76599ef5e6717e70d3993a36",
+                    "mixHash" : "0x81be1ccf3b6dac889ccc0d267513eea6719c9916669c922429e886685d4ed9db",
+                    "nonce" : "0x57e461a5e5719eb0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0529cbd1ffb8e91ad0a371ba2539613d424b6d5114a7bb6ceab3ef8fde374859888c6c6e53699f53408f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a081be1ccf3b6dac889ccc0d267513eea6719c9916669c922429e886685d4ed9db8857e461a5e5719eb0f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x782256de08b33a7bbd9b8d756c3f80cf22d36c8011b7272bfbe5f786e6694e4f",
+        "lastblockhash" : "0xe0e6da34b1479e6f74b84b397fe539645c64efda76599ef5e6717e70d3993a36",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9a909796c2dcd6a067917a8d9a01d7d59454b379ec8bb30116bf69db608ff527",
-                    "mixHash" : "0x2d385236db48050775ceea9bccf401e65cc488404611c30c9123e1b9e31ec279",
-                    "nonce" : "0x11caa075d4168d48",
+                    "hash" : "0xdf65a03c8a6a6ee8963f0c195808277336e3bee90359fc1590928a6b7ad01309",
+                    "mixHash" : "0x2b1a1bfd813228d5d197de966a02a1b8933df7aa453b33934c99da4aa72902f9",
+                    "nonce" : "0xa814143b277fe94a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d385236db48050775ceea9bccf401e65cc488404611c30c9123e1b9e31ec2798811caa075d4168d48f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b1a1bfd813228d5d197de966a02a1b8933df7aa453b33934c99da4aa72902f988a814143b277fe94af85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a909796c2dcd6a067917a8d9a01d7d59454b379ec8bb30116bf69db608ff527",
+        "lastblockhash" : "0xdf65a03c8a6a6ee8963f0c195808277336e3bee90359fc1590928a6b7ad01309",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d1g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5ec0f19b31a77a7aa32b29788403c7d69cff81bb2fb8d317f01a3b510df72946",
-                    "mixHash" : "0xaa3c8c6e42ae05446935dfd819287683fc700d865fe51d2439af6f42442b869e",
-                    "nonce" : "0x658dc2a6248aa168",
+                    "hash" : "0x1f46f3f5ec1a2169ba18d3b54eac81e590f15d2235c5a0d525e2f68e6f285777",
+                    "mixHash" : "0xeabce14203f74e7ccc14eb82cfb025c5324ee3c95ae337a6b1e08ed30639278c",
+                    "nonce" : "0x037e1eec42620e7a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xa56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aa3c8c6e42ae05446935dfd819287683fc700d865fe51d2439af6f42442b869e88658dc2a6248aa168f85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a56c4caaf5c2ff370b3df8a493aa58f876bb2c2937f3b906a6d7813a995a5b7ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eabce14203f74e7ccc14eb82cfb025c5324ee3c95ae337a6b1e08ed30639278c88037e1eec42620e7af85ff85d800183061a8080830186a08e60016001600160010c60006000f31ca012941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432a027f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010c60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ec0f19b31a77a7aa32b29788403c7d69cff81bb2fb8d317f01a3b510df72946",
+        "lastblockhash" : "0x1f46f3f5ec1a2169ba18d3b54eac81e590f15d2235c5a0d525e2f68e6f285777",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0.json
index 41c211f6d..7c7f5b180 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d20g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x456573da2337756ba45cc650fc7d38000a53d6c1dcb4954d93d93e2d4ad4e3aa",
-                    "mixHash" : "0x3b98f6e1256d701e62d46430cc757f8a82b86f8fde6fa96ab0dc3d5f05957e7e",
-                    "nonce" : "0x391d603f49f2f6d9",
+                    "hash" : "0xf8951683f11d204b03fb01e5dc729683c5b6ee74d3cbbf4b827e38a5babf7720",
+                    "mixHash" : "0xc812c913332f91b284bfba40625fd5b371ee92901c013499ed1488e2ed87222a",
+                    "nonce" : "0xd84333125f85fa2c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b98f6e1256d701e62d46430cc757f8a82b86f8fde6fa96ab0dc3d5f05957e7e88391d603f49f2f6d9f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c812c913332f91b284bfba40625fd5b371ee92901c013499ed1488e2ed87222a88d84333125f85fa2cf85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x456573da2337756ba45cc650fc7d38000a53d6c1dcb4954d93d93e2d4ad4e3aa",
+        "lastblockhash" : "0xf8951683f11d204b03fb01e5dc729683c5b6ee74d3cbbf4b827e38a5babf7720",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d20g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe13f64146d774a54db95db221f64e2e3b7370c5da1d4fffc62f53ac590bd47f4",
-                    "mixHash" : "0xf58d30d871d554640c8b73e5b2d552a7bb7283ffac9e1d56424b4baa83e870d3",
-                    "nonce" : "0x7975f7c2964610c6",
+                    "hash" : "0xa714cd2dab11c028beb3ba7b5c59aa3c0efea2b6b702e09497cf018dd32ec1ab",
+                    "mixHash" : "0xb4cc4e83caa931e9f2e3c9e97f882dcf9dea57abcafffcb0f72c54676ddd8cfc",
+                    "nonce" : "0x740c6a5ce1fff617",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f58d30d871d554640c8b73e5b2d552a7bb7283ffac9e1d56424b4baa83e870d3887975f7c2964610c6f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b4cc4e83caa931e9f2e3c9e97f882dcf9dea57abcafffcb0f72c54676ddd8cfc88740c6a5ce1fff617f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe13f64146d774a54db95db221f64e2e3b7370c5da1d4fffc62f53ac590bd47f4",
+        "lastblockhash" : "0xa714cd2dab11c028beb3ba7b5c59aa3c0efea2b6b702e09497cf018dd32ec1ab",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d20g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x95c9b7a7e5fdae2f0e2acbd6f5b1bbf8d3e7f286b5cd80eb7dbb9d0d9d394766",
-                    "mixHash" : "0xfe0881fea282356e41a8d8e62bc25f490cd5d5b29cca8eb16f1dbb7fbac59dee",
-                    "nonce" : "0xef7cddc4123f0da0",
+                    "hash" : "0xa7f0c0615b25fe0b6a97d58c9e19e6b61aeaa944fa5a4294866a1086b7b212e4",
+                    "mixHash" : "0x67975ff7041f38d4887828e53361ede17230c313f46d9cfb0b37781d084d98cf",
+                    "nonce" : "0xaa9a8965d1668eb2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fe0881fea282356e41a8d8e62bc25f490cd5d5b29cca8eb16f1dbb7fbac59dee88ef7cddc4123f0da0f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a067975ff7041f38d4887828e53361ede17230c313f46d9cfb0b37781d084d98cf88aa9a8965d1668eb2f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95c9b7a7e5fdae2f0e2acbd6f5b1bbf8d3e7f286b5cd80eb7dbb9d0d9d394766",
+        "lastblockhash" : "0xa7f0c0615b25fe0b6a97d58c9e19e6b61aeaa944fa5a4294866a1086b7b212e4",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d20g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0961ecf77efa82c457f704d939876edeca278456afbf646e97505e24d5d68f70",
-                    "mixHash" : "0x6074d8c845eac85d48e74fe80705cf28455d326a4e3e54311be0f54a1677cbb5",
-                    "nonce" : "0x7cb30a5a03623463",
+                    "hash" : "0x89fdabebe7fb60046d08c196746a91cd847bbbf91984d01ab25cbae0d3f644ff",
+                    "mixHash" : "0xc6b352869df59f89c90a8d0c5236d9008cfc4b73d79fd14bce57a775ee724495",
+                    "nonce" : "0xb12e5c8fb305391d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06074d8c845eac85d48e74fe80705cf28455d326a4e3e54311be0f54a1677cbb5887cb30a5a03623463f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c6b352869df59f89c90a8d0c5236d9008cfc4b73d79fd14bce57a775ee72449588b12e5c8fb305391df85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0961ecf77efa82c457f704d939876edeca278456afbf646e97505e24d5d68f70",
+        "lastblockhash" : "0x89fdabebe7fb60046d08c196746a91cd847bbbf91984d01ab25cbae0d3f644ff",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d20g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc8521747b39778d3a8c043e4fe523b80c3ca95975038e35a7d6acbc50204d473",
-                    "mixHash" : "0x6147c09f11af1b6681c72b78913189681a5e6eb1d4f7cdbdd8adb655e6b963a5",
-                    "nonce" : "0x127527c6e7c35598",
+                    "hash" : "0x4064d6ce82fae3343caca68c8ef056763542e567efb0746f2618bf98a0bf5c4f",
+                    "mixHash" : "0x133fa597eaf7b1b372ec2ea96456dc223aae1c13ddd06928a9a0a1bc9b4fe099",
+                    "nonce" : "0x6bd23c01d32d72ef",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06147c09f11af1b6681c72b78913189681a5e6eb1d4f7cdbdd8adb655e6b963a588127527c6e7c35598f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0133fa597eaf7b1b372ec2ea96456dc223aae1c13ddd06928a9a0a1bc9b4fe099886bd23c01d32d72eff85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc8521747b39778d3a8c043e4fe523b80c3ca95975038e35a7d6acbc50204d473",
+        "lastblockhash" : "0x4064d6ce82fae3343caca68c8ef056763542e567efb0746f2618bf98a0bf5c4f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d20g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d20g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3976c6e1103895be8465efa2f109ffc0db2f33d35f9aa58333765ce1a476bfde",
-                    "mixHash" : "0x1aa68e998c7b50ef9f4b30259907bc51c4ec35dc4ddde7cc889cbfada9490a29",
-                    "nonce" : "0x4070390bf6846704",
+                    "hash" : "0xbf509e802715dc902ca37bb8f526fd1da80791af8b3844bd8f2b51ff763d1500",
+                    "mixHash" : "0x50ccd6222c4454aae50657f534208457180c74a8a8e68190abee84dba30a9115",
+                    "nonce" : "0x53d29fb1f743b10a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x81bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01aa68e998c7b50ef9f4b30259907bc51c4ec35dc4ddde7cc889cbfada9490a29884070390bf6846704f85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea081bc1aea94310a04d12d9a9e5a0fafe159683a24ef6d2d4d809e65880cb11f86a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a050ccd6222c4454aae50657f534208457180c74a8a8e68190abee84dba30a91158853d29fb1f743b10af85ef85c800183061a8080830186a08e60016001600160012b60006000f31c9fa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3a020bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012b60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3976c6e1103895be8465efa2f109ffc0db2f33d35f9aa58333765ce1a476bfde",
+        "lastblockhash" : "0xbf509e802715dc902ca37bb8f526fd1da80791af8b3844bd8f2b51ff763d1500",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
index 6112e4114..0fe3e8b9b 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d21g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8b390a16176b36bada1216f31b7eae2ecfb9df91b86ee295539926defff249a0",
-                    "mixHash" : "0xe4a00ae8ae856b87d46de174bd5141f2fa92607483e874a9ba14430ff619afe7",
-                    "nonce" : "0x72d099dd89c96adb",
+                    "hash" : "0xed58a6ba652b98550b429a9c8d6595815c6bcf08dcc18c83f5c3cdf7def3df74",
+                    "mixHash" : "0xba894621f4abb7eb4eb836bdd74ee0f4fdc3142936dbecaf02edd22292292245",
+                    "nonce" : "0x5aed88ff7bb99cfb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e4a00ae8ae856b87d46de174bd5141f2fa92607483e874a9ba14430ff619afe78872d099dd89c96adbf85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ba894621f4abb7eb4eb836bdd74ee0f4fdc3142936dbecaf02edd22292292245885aed88ff7bb99cfbf85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b390a16176b36bada1216f31b7eae2ecfb9df91b86ee295539926defff249a0",
+        "lastblockhash" : "0xed58a6ba652b98550b429a9c8d6595815c6bcf08dcc18c83f5c3cdf7def3df74",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d21g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3e033b00fb3809eeafdece08a204855f9daa34e9b79c8d2c98c8704108592ad1",
-                    "mixHash" : "0x74836f7abf6d44734924b877bf8d01c4e8252d75ffd3948fd48236a0a630501c",
-                    "nonce" : "0x0ab8fc9b0b60cc7a",
+                    "hash" : "0xed32847b21c456ea594f313838ae8afe30954cdbf70d86906d2fc70d6feae238",
+                    "mixHash" : "0x7b91712ccc8d3c89e75285fa9c0e28e0ac23a7722a81020c521033bb304f5ed2",
+                    "nonce" : "0x655711cd4a2b4114",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a074836f7abf6d44734924b877bf8d01c4e8252d75ffd3948fd48236a0a630501c880ab8fc9b0b60cc7af85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07b91712ccc8d3c89e75285fa9c0e28e0ac23a7722a81020c521033bb304f5ed288655711cd4a2b4114f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e033b00fb3809eeafdece08a204855f9daa34e9b79c8d2c98c8704108592ad1",
+        "lastblockhash" : "0xed32847b21c456ea594f313838ae8afe30954cdbf70d86906d2fc70d6feae238",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d21g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b02368bb2fcd47d8e136f79a83013783a16001e3c4d756efca20316dc4d7c54",
-                    "mixHash" : "0x4e04eb9d9f6e52d3467caa7c7acb136ac4b1528dff91839214b5af0bdae2255e",
-                    "nonce" : "0x87e0c8fba10e7a44",
+                    "hash" : "0xb2bb5d76264e75c1ced2de0b4a6750b420ebb2aff94e53a2ab456c8a73ae41c6",
+                    "mixHash" : "0x118ee7398a65fe57a5608921d56b1fb61d80f64be3b4c1c9bbc605f94da3af7b",
+                    "nonce" : "0xe148a4c30798278a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e04eb9d9f6e52d3467caa7c7acb136ac4b1528dff91839214b5af0bdae2255e8887e0c8fba10e7a44f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0118ee7398a65fe57a5608921d56b1fb61d80f64be3b4c1c9bbc605f94da3af7b88e148a4c30798278af85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b02368bb2fcd47d8e136f79a83013783a16001e3c4d756efca20316dc4d7c54",
+        "lastblockhash" : "0xb2bb5d76264e75c1ced2de0b4a6750b420ebb2aff94e53a2ab456c8a73ae41c6",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d21g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf59675dfb3c9e496fcc52c7026f07d9016768c9cf3f4cde1cfffc15ca2ef9991",
-                    "mixHash" : "0x5b9ccc3a3ad1927f04880812249940788292bc788c4ecd0e9dd645ce7288ea7b",
-                    "nonce" : "0xa0d4e21db9e65e1b",
+                    "hash" : "0x6b2c77016cb1994dcb91aa2c3f1a702ad04c444023a2aee07ef6d31031e43d46",
+                    "mixHash" : "0xf4a30dbb413d6e46e431bc7e3c386e9599b69dbc84a7d7b78cd49fa37acecd47",
+                    "nonce" : "0xd0c0bcc0a667d303",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b9ccc3a3ad1927f04880812249940788292bc788c4ecd0e9dd645ce7288ea7b88a0d4e21db9e65e1bf85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f4a30dbb413d6e46e431bc7e3c386e9599b69dbc84a7d7b78cd49fa37acecd4788d0c0bcc0a667d303f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf59675dfb3c9e496fcc52c7026f07d9016768c9cf3f4cde1cfffc15ca2ef9991",
+        "lastblockhash" : "0x6b2c77016cb1994dcb91aa2c3f1a702ad04c444023a2aee07ef6d31031e43d46",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d21g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x338e623d5f8904ccb37dd17a77ebb6f42a58df6ffb6b009968f456eee0ca7fbc",
-                    "mixHash" : "0x197f7c0a364ec1a2da6a58644fe4d3e614d4602c8621d43656215d8864254b9e",
-                    "nonce" : "0x31a599a2953cdfd1",
+                    "hash" : "0x07cb6d942a5b520c35a82bbfc8406c773025823a984396ce124ea2a1f0297330",
+                    "mixHash" : "0xdd33bf1a9b72b4f000a60e7aa7306a6eece5de332aabd26513757f8982ec4fff",
+                    "nonce" : "0x35ce3022a176c418",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0197f7c0a364ec1a2da6a58644fe4d3e614d4602c8621d43656215d8864254b9e8831a599a2953cdfd1f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dd33bf1a9b72b4f000a60e7aa7306a6eece5de332aabd26513757f8982ec4fff8835ce3022a176c418f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x338e623d5f8904ccb37dd17a77ebb6f42a58df6ffb6b009968f456eee0ca7fbc",
+        "lastblockhash" : "0x07cb6d942a5b520c35a82bbfc8406c773025823a984396ce124ea2a1f0297330",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d21g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d21g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x560b9370eb57c0f307167db1973637eafc1ccc019dcac213e4ab2de45a844955",
-                    "mixHash" : "0x351e58383abec90733b3c144b4432709bf6df54085e55c4c026e715fa07a3940",
-                    "nonce" : "0x260d8bdf78a852d3",
+                    "hash" : "0xd19a3fabd34a5180b1472f3cc436224999913cf48c2ea1b3787b0819f82f5c2a",
+                    "mixHash" : "0xcf27624d7c425b300b0a3a9d58c04efd99798321d0a26ef9bb8764e77cd72935",
+                    "nonce" : "0x3ce2f21ea7cba3d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0351e58383abec90733b3c144b4432709bf6df54085e55c4c026e715fa07a394088260d8bdf78a852d3f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0882e39cdfcaf96afa3eec3b61e83c837243310eda7f48129064ebddf125c0c5ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cf27624d7c425b300b0a3a9d58c04efd99798321d0a26ef9bb8764e77cd72935883ce2f21ea7cba3d6f85ff85d800183061a8080830186a08e60016001600160012c60006000f31ca0ef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fea037e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012c60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x560b9370eb57c0f307167db1973637eafc1ccc019dcac213e4ab2de45a844955",
+        "lastblockhash" : "0xd19a3fabd34a5180b1472f3cc436224999913cf48c2ea1b3787b0819f82f5c2a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0.json
index 7c22fa634..ed1698389 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d22g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc31ebf9c9ccd3098d77595125063ca130231fa00eb417a41305fc4eb23512934",
-                    "mixHash" : "0x8a2aa539d9a4ac7f2c334361defb840b3705b6277599ddff4f0e94d3740650a9",
-                    "nonce" : "0x376e51d8c15b1729",
+                    "hash" : "0x5d3b9efb45e383c0ce0ff09c09d0a94d144e6521f8bc4cd5752893d5ca2083f1",
+                    "mixHash" : "0xb4ae264489e3990510ce9878c984c33bac14b229f22988a47e3691ecc4029c1e",
+                    "nonce" : "0x75fb37e4e40993c9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08a2aa539d9a4ac7f2c334361defb840b3705b6277599ddff4f0e94d3740650a988376e51d8c15b1729f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b4ae264489e3990510ce9878c984c33bac14b229f22988a47e3691ecc4029c1e8875fb37e4e40993c9f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc31ebf9c9ccd3098d77595125063ca130231fa00eb417a41305fc4eb23512934",
+        "lastblockhash" : "0x5d3b9efb45e383c0ce0ff09c09d0a94d144e6521f8bc4cd5752893d5ca2083f1",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d22g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4a385d40529a6b2e5c40e448158edd5368afef1c53679b338a9173a728f85d59",
-                    "mixHash" : "0x71e7b6a46bf2825937500796faf47cb7c30fb68f20d65a90e2a641a5a9afb251",
-                    "nonce" : "0xbf62ce9dd83dfdb1",
+                    "hash" : "0x73fdaee84c67e4999c964ba933d27a1e7ee6df061d625f9d048b721b1a1717c7",
+                    "mixHash" : "0xf5ad93311774591f1793295d31727d9dae1cbe9a0b3b6da9c33d01df5b76e8a0",
+                    "nonce" : "0x08b2b38c26b07d61",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a071e7b6a46bf2825937500796faf47cb7c30fb68f20d65a90e2a641a5a9afb25188bf62ce9dd83dfdb1f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f5ad93311774591f1793295d31727d9dae1cbe9a0b3b6da9c33d01df5b76e8a08808b2b38c26b07d61f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a385d40529a6b2e5c40e448158edd5368afef1c53679b338a9173a728f85d59",
+        "lastblockhash" : "0x73fdaee84c67e4999c964ba933d27a1e7ee6df061d625f9d048b721b1a1717c7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d22g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x60c355b6feeab6698dafdbcdfcc80b725381e859c7f231a90f51849052156fbe",
-                    "mixHash" : "0x71df0bf6d5a3e17da93c610e3a39c03c71a722ad7d8c104c884e669ad6c05995",
-                    "nonce" : "0x926831a8acb8f7d0",
+                    "hash" : "0x1cec437076a2207ace538fd923b205f90825173299c888fa9dd3819ff07538c9",
+                    "mixHash" : "0x805b754f57e57644bf9187d88d182b8bbb2cfd5fc4121fa092852160c69ff49f",
+                    "nonce" : "0x29f33b3a04324570",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a071df0bf6d5a3e17da93c610e3a39c03c71a722ad7d8c104c884e669ad6c0599588926831a8acb8f7d0f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0805b754f57e57644bf9187d88d182b8bbb2cfd5fc4121fa092852160c69ff49f8829f33b3a04324570f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60c355b6feeab6698dafdbcdfcc80b725381e859c7f231a90f51849052156fbe",
+        "lastblockhash" : "0x1cec437076a2207ace538fd923b205f90825173299c888fa9dd3819ff07538c9",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d22g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xaf4846c178cec5cc40cebe483393db871384bff1777d32fe68495b15889ec55f",
-                    "mixHash" : "0x58b59d5eb3ffe315284f72777b842070dc50177539b8c50fb109d7462e4a02b3",
-                    "nonce" : "0x6aeb178cfeecdb73",
+                    "hash" : "0x1c20fffb8ffc7aafcd8670bc3cd5c2b647212876cfa39a5b006057233d8b0830",
+                    "mixHash" : "0x436f34c5d8d65294c9b0c62d46506452575ef31c7d81c1956b21ed81cacfa0de",
+                    "nonce" : "0x5ec66a2f9ec5d741",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a058b59d5eb3ffe315284f72777b842070dc50177539b8c50fb109d7462e4a02b3886aeb178cfeecdb73f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0436f34c5d8d65294c9b0c62d46506452575ef31c7d81c1956b21ed81cacfa0de885ec66a2f9ec5d741f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf4846c178cec5cc40cebe483393db871384bff1777d32fe68495b15889ec55f",
+        "lastblockhash" : "0x1c20fffb8ffc7aafcd8670bc3cd5c2b647212876cfa39a5b006057233d8b0830",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d22g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4dcc7119202a8b243dc22e6a2b541386937b720c89da14ee24af5720e1f2a3b4",
-                    "mixHash" : "0x63ce0babad73b03eab4c5c6401c0359a2a0ddc25f272447f79f26a006274f430",
-                    "nonce" : "0x6e07a6976cffea4a",
+                    "hash" : "0x53fd1dae8bbb97a91817f9a8a787217b1906e34fbb7fc0badf3c2069d99ea8af",
+                    "mixHash" : "0x694f81084a98cc37e1f7230764f11902b7216f9823916f067ddeee9e2fd40e63",
+                    "nonce" : "0x4b9b1677319a7c17",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a063ce0babad73b03eab4c5c6401c0359a2a0ddc25f272447f79f26a006274f430886e07a6976cffea4af85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0694f81084a98cc37e1f7230764f11902b7216f9823916f067ddeee9e2fd40e63884b9b1677319a7c17f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4dcc7119202a8b243dc22e6a2b541386937b720c89da14ee24af5720e1f2a3b4",
+        "lastblockhash" : "0x53fd1dae8bbb97a91817f9a8a787217b1906e34fbb7fc0badf3c2069d99ea8af",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d22g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d22g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdf474aeeef232dbd95e37a8dce86387ee47b98f068c8da44f33caba1adea55bb",
-                    "mixHash" : "0xd94ece660f0316717477afd6a0d34fc545edcf62bc5e089b627609ef75946a84",
-                    "nonce" : "0x43a008326c191851",
+                    "hash" : "0x68419c40b23e89d19754778ef648c425ead8b3eea8d83d82cb90e06cee8cb95e",
+                    "mixHash" : "0x7f94893447cd9d9b1d110fc752ade3e6279fff4824771a2e743a6c0f322022d2",
+                    "nonce" : "0x405dc1e27199ca30",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x82ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d94ece660f0316717477afd6a0d34fc545edcf62bc5e089b627609ef75946a848843a008326c191851f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea082ddb9cfd2161f97b747abc03c964d2fbb23e419399086f8e0c61a78adc56c2da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f94893447cd9d9b1d110fc752ade3e6279fff4824771a2e743a6c0f322022d288405dc1e27199ca30f85ff85d800183061a8080830186a08e60016001600160012d60006000f31ba026c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940a03e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012d60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf474aeeef232dbd95e37a8dce86387ee47b98f068c8da44f33caba1adea55bb",
+        "lastblockhash" : "0x68419c40b23e89d19754778ef648c425ead8b3eea8d83d82cb90e06cee8cb95e",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0.json
index 84607a17e..721df62d7 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d23g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf2910c19dc81ee486b5c95a080c02b3e42dc8371e4ec30af411c905cfe52890c",
-                    "mixHash" : "0xf1fc7f14a9a554145dcf4ebee38ed5098f9164527c94d015822e90016606a2ad",
-                    "nonce" : "0xdb6a4a0d408f4217",
+                    "hash" : "0xc447bb40acb03c81e6c92cf40ab11d99766ac43b12984fb2a1b37f7013fe448a",
+                    "mixHash" : "0xd99d32aa288f482d9edd4d5ed471a172e7f8f48fe25c0e645f36b3f4c5bcba81",
+                    "nonce" : "0x1ce11c0c0c153260",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f1fc7f14a9a554145dcf4ebee38ed5098f9164527c94d015822e90016606a2ad88db6a4a0d408f4217f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d99d32aa288f482d9edd4d5ed471a172e7f8f48fe25c0e645f36b3f4c5bcba81881ce11c0c0c153260f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2910c19dc81ee486b5c95a080c02b3e42dc8371e4ec30af411c905cfe52890c",
+        "lastblockhash" : "0xc447bb40acb03c81e6c92cf40ab11d99766ac43b12984fb2a1b37f7013fe448a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d23g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x710dc09b9f90190666fe837b24edf80c442730e94a9518f9793f87a8e3ecd4bd",
-                    "mixHash" : "0x7bcb42d1fdfcf3b6e1564b44b26b6dc813d81a9baecd7643bcdfe39abd2e9402",
-                    "nonce" : "0xc1b003a307cc92b1",
+                    "hash" : "0x904cf4c662b513370ba4b40d10c41ebf6542b2ac5ebc7d2ac469c80c490509ec",
+                    "mixHash" : "0x02290000d892b0a19ef1615e8dac92bb1f3381b8e56d1877f2b87fa4617ff4ab",
+                    "nonce" : "0xebeea6473f5bd24d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07bcb42d1fdfcf3b6e1564b44b26b6dc813d81a9baecd7643bcdfe39abd2e940288c1b003a307cc92b1f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002290000d892b0a19ef1615e8dac92bb1f3381b8e56d1877f2b87fa4617ff4ab88ebeea6473f5bd24df85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x710dc09b9f90190666fe837b24edf80c442730e94a9518f9793f87a8e3ecd4bd",
+        "lastblockhash" : "0x904cf4c662b513370ba4b40d10c41ebf6542b2ac5ebc7d2ac469c80c490509ec",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d23g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x25337dd28716d45cc1c262e43e13146c29ebedda67506b407ec59a60c0ed98cf",
-                    "mixHash" : "0x3080c829e79efe5d7c7c00f0c1bb8bf48ea1f944e5a1ce411e42ce09aa5f2dc2",
-                    "nonce" : "0xcc967727fe1df953",
+                    "hash" : "0x00075c79b3e92da2287be68668419b000500455ff81df1dfb224ca9e3b44c272",
+                    "mixHash" : "0x5f6b5f143b3fbe4c1d18606246a3063ab0c32c658808e55b3708d20fea4dbed0",
+                    "nonce" : "0xc0ac39b6512419bb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03080c829e79efe5d7c7c00f0c1bb8bf48ea1f944e5a1ce411e42ce09aa5f2dc288cc967727fe1df953f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05f6b5f143b3fbe4c1d18606246a3063ab0c32c658808e55b3708d20fea4dbed088c0ac39b6512419bbf85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x25337dd28716d45cc1c262e43e13146c29ebedda67506b407ec59a60c0ed98cf",
+        "lastblockhash" : "0x00075c79b3e92da2287be68668419b000500455ff81df1dfb224ca9e3b44c272",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d23g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9e1acdf44798018ad6d54a6eb7313479f2aed394ca40e6919a574c0f9590838c",
-                    "mixHash" : "0x043d24a0f4e3401bcc63ec4f73bf11781f88b17c392b504f3a29f30354484dee",
-                    "nonce" : "0xd6e37fc181bfcfe0",
+                    "hash" : "0xae7456b15109e9a2a94b9b1deba9e77c2f523de58dcc95bd177f0a7b43a4c68d",
+                    "mixHash" : "0x116d6e949e02cff29884a01c9359287b6d21c672607c2d70f05c984d0b1bc5fb",
+                    "nonce" : "0x957bffb0dd551ee7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0043d24a0f4e3401bcc63ec4f73bf11781f88b17c392b504f3a29f30354484dee88d6e37fc181bfcfe0f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0116d6e949e02cff29884a01c9359287b6d21c672607c2d70f05c984d0b1bc5fb88957bffb0dd551ee7f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e1acdf44798018ad6d54a6eb7313479f2aed394ca40e6919a574c0f9590838c",
+        "lastblockhash" : "0xae7456b15109e9a2a94b9b1deba9e77c2f523de58dcc95bd177f0a7b43a4c68d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d23g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5c68036ef53e0d44cf6452382705ed3b3737b8bd0addf0e7010844bf15a983d1",
-                    "mixHash" : "0x6fe4ba1e9f2685c1bf2e745513f14f2827931a2f3575074c4d20ce285ec84953",
-                    "nonce" : "0x267986689a468ca3",
+                    "hash" : "0xec58243732281219055c99e7724216559b9991549dfc67473ed156451a739e83",
+                    "mixHash" : "0x141f4d86306d8c14bea3d69b3eef4f04e9175efc98876d409b61b792637a7457",
+                    "nonce" : "0x597337ab5759b475",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06fe4ba1e9f2685c1bf2e745513f14f2827931a2f3575074c4d20ce285ec8495388267986689a468ca3f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0141f4d86306d8c14bea3d69b3eef4f04e9175efc98876d409b61b792637a745788597337ab5759b475f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c68036ef53e0d44cf6452382705ed3b3737b8bd0addf0e7010844bf15a983d1",
+        "lastblockhash" : "0xec58243732281219055c99e7724216559b9991549dfc67473ed156451a739e83",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d23g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d23g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x55cbcaa7bc3908ac31ca6b8963cd5fca1b7ff77b2b632a1703c3af277df26250",
-                    "mixHash" : "0xe42d017aa0bfbaf3b7165020f916d29884e8bd0d8b187f5d4d348fbd2fee6588",
-                    "nonce" : "0x7b81c89fb06bc091",
+                    "hash" : "0x61278b3aee3cba218b40836617f09b38acf3232ad369e58bf464f8f767857a86",
+                    "mixHash" : "0xcd8b5dc0e9bb5e66aba94877acbdf715d942b3ce643e71ade99a61f00641907b",
+                    "nonce" : "0xb1c152097e6ed657",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x46f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e42d017aa0bfbaf3b7165020f916d29884e8bd0d8b187f5d4d348fbd2fee6588887b81c89fb06bc091f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea046f7a8abb9999a6fb1b4a640c86887684c2eb689bc2e0a4dda6401d4da362ef4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cd8b5dc0e9bb5e66aba94877acbdf715d942b3ce643e71ade99a61f00641907b88b1c152097e6ed657f85ff85d800183061a8080830186a08e60016001600160012e60006000f31ca079380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756ea07919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012e60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55cbcaa7bc3908ac31ca6b8963cd5fca1b7ff77b2b632a1703c3af277df26250",
+        "lastblockhash" : "0x61278b3aee3cba218b40836617f09b38acf3232ad369e58bf464f8f767857a86",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0.json
index 2d7161e1c..7ca467fe7 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d24g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6081090be73aeb564c612f70b33db7b58a96f4ef482e06bd57510a2e5ec18821",
-                    "mixHash" : "0xddef845764dc0fffc324570aa2e3ff04663d05804d368bb9390e4633ab8b0b9d",
-                    "nonce" : "0x363445e677dda918",
+                    "hash" : "0x87d6570debb178647106d7fa5a2a274af80996c4c33eab145c1285301d384871",
+                    "mixHash" : "0x2a2a4aa41de501cc097d6b48e6af5523dd1f44927f41ad1af0e8e82a98a8abf3",
+                    "nonce" : "0x9296bb6fc1b545b0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ddef845764dc0fffc324570aa2e3ff04663d05804d368bb9390e4633ab8b0b9d88363445e677dda918f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02a2a4aa41de501cc097d6b48e6af5523dd1f44927f41ad1af0e8e82a98a8abf3889296bb6fc1b545b0f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6081090be73aeb564c612f70b33db7b58a96f4ef482e06bd57510a2e5ec18821",
+        "lastblockhash" : "0x87d6570debb178647106d7fa5a2a274af80996c4c33eab145c1285301d384871",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d24g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9515d7602561946b2a121752d1143ca54e46f651362cb2abd2cadb07466de580",
-                    "mixHash" : "0x7795f5d049f646e942d026b5639a8ad4a0d90d3ce013d97b63b945f5344f11fe",
-                    "nonce" : "0x6b0e2881e5131285",
+                    "hash" : "0xf5edc87839b77edfe00590531eae763c8f15dc8f425f7169ab1777b86a62e554",
+                    "mixHash" : "0x9f0f060e1519080c1a2a71c1e86db4f2405faa83ff034f048133ceb9336665d0",
+                    "nonce" : "0x3317fd988fe6141c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07795f5d049f646e942d026b5639a8ad4a0d90d3ce013d97b63b945f5344f11fe886b0e2881e5131285f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09f0f060e1519080c1a2a71c1e86db4f2405faa83ff034f048133ceb9336665d0883317fd988fe6141cf85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9515d7602561946b2a121752d1143ca54e46f651362cb2abd2cadb07466de580",
+        "lastblockhash" : "0xf5edc87839b77edfe00590531eae763c8f15dc8f425f7169ab1777b86a62e554",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d24g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x273bdd30e6c9b19968b319c0469b6299ee213093f9bba5af0d96281454829ff1",
-                    "mixHash" : "0xb28b1cca8bb37720aef44d8674c2e563e2e541b48b96bb7a980c6f98b3369dea",
-                    "nonce" : "0x01f47fc3c83ab1ec",
+                    "hash" : "0xe813c0bff0c6d20648d326ab30c49c7c571e4eb71ccbfeb6298bf4c369f56cfa",
+                    "mixHash" : "0x4a58d1144206dfcf88d2f78e4cc7cfe64f84d9365b219c680b35b5e11be95f4c",
+                    "nonce" : "0x5c31a505b8e0ba83",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b28b1cca8bb37720aef44d8674c2e563e2e541b48b96bb7a980c6f98b3369dea8801f47fc3c83ab1ecf85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04a58d1144206dfcf88d2f78e4cc7cfe64f84d9365b219c680b35b5e11be95f4c885c31a505b8e0ba83f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x273bdd30e6c9b19968b319c0469b6299ee213093f9bba5af0d96281454829ff1",
+        "lastblockhash" : "0xe813c0bff0c6d20648d326ab30c49c7c571e4eb71ccbfeb6298bf4c369f56cfa",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d24g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x05728eb10491b4c368dc555b47eb2bfabb086fd64d0be1bf036d6c1c63614399",
-                    "mixHash" : "0x99d9592e5b96f5fdc3c0ee85054d4df5f03444eec966fa8a3f7166299aae5957",
-                    "nonce" : "0xff05ff1d9915100d",
+                    "hash" : "0x0b420a9528f6f913bb05c84799ba328f3a80688f9f39f58d17b3e857e16518f9",
+                    "mixHash" : "0xcb28abc03be77d7458c91cb3254aa376641c3370dcd94f4646d6c5c0145239ba",
+                    "nonce" : "0x7ceacff7ddcc6acc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a099d9592e5b96f5fdc3c0ee85054d4df5f03444eec966fa8a3f7166299aae595788ff05ff1d9915100df85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cb28abc03be77d7458c91cb3254aa376641c3370dcd94f4646d6c5c0145239ba887ceacff7ddcc6accf85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05728eb10491b4c368dc555b47eb2bfabb086fd64d0be1bf036d6c1c63614399",
+        "lastblockhash" : "0x0b420a9528f6f913bb05c84799ba328f3a80688f9f39f58d17b3e857e16518f9",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d24g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfc73b46a9a7e2ed6b4bccb1956dddd85962c07a72d6d28bcc2e037560a0e5efb",
-                    "mixHash" : "0x7f21837e5d98f598e5174e0018762a35e2c263cc51e691337091e5818e375a96",
-                    "nonce" : "0x2691e13a250cfde6",
+                    "hash" : "0xe30cd68395d0f2c28a0152db469f9710db00feaf757b09a1f936efe768af530a",
+                    "mixHash" : "0x68f76ad743dc7dc7e7fa40b3f644697e22ed903ecb4bf70abdcf06a1dc8201a1",
+                    "nonce" : "0x0ca02769dd12e559",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f21837e5d98f598e5174e0018762a35e2c263cc51e691337091e5818e375a96882691e13a250cfde6f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a068f76ad743dc7dc7e7fa40b3f644697e22ed903ecb4bf70abdcf06a1dc8201a1880ca02769dd12e559f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc73b46a9a7e2ed6b4bccb1956dddd85962c07a72d6d28bcc2e037560a0e5efb",
+        "lastblockhash" : "0xe30cd68395d0f2c28a0152db469f9710db00feaf757b09a1f936efe768af530a",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d24g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d24g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0e2e5a45a88202e41d2961c8d7d8a1eb9a2d5049c14e40bb5ecd12c8da282c4c",
-                    "mixHash" : "0x57eac8fb9d17503cb8f2ada421f34660552f6c58c438d0f9ae3a022737632894",
-                    "nonce" : "0x4e280d4db718bbe9",
+                    "hash" : "0x8b2ecd7ca8cb7df3dc4dbde4730c3fe5940b4ba7d89b708f863c38d23c4cb191",
+                    "mixHash" : "0x2a34321ff1bb41144142cfc35b6c3a8c81e3407463fb89e7741b8baedc7d55a4",
+                    "nonce" : "0x40db4270d41960a7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x54d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057eac8fb9d17503cb8f2ada421f34660552f6c58c438d0f9ae3a022737632894884e280d4db718bbe9f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea054d46edf137cd65d009ff0003f2e171639905182e58ec16c32b63be9b1f7352da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02a34321ff1bb41144142cfc35b6c3a8c81e3407463fb89e7741b8baedc7d55a48840db4270d41960a7f85ff85d800183061a8080830186a08e60016001600160012f60006000f31ba0f56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649a029e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160012f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e2e5a45a88202e41d2961c8d7d8a1eb9a2d5049c14e40bb5ecd12c8da282c4c",
+        "lastblockhash" : "0x8b2ecd7ca8cb7df3dc4dbde4730c3fe5940b4ba7d89b708f863c38d23c4cb191",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0.json
index 0d7a162c4..d82a26bab 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d25g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1e07c1746d820806ef8c254efabe30e36023aa4b9179e4bda312713df44ccbd4",
-                    "mixHash" : "0x5763bd13bd9594730206979d88adae615b7b9319650e50034837c8fcd3bf3fd6",
-                    "nonce" : "0xe05565e9485389cd",
+                    "hash" : "0xccb8b7ae2f7d56ea62a875c07b82987139d34ceb1d606d14527cde5c52df7b87",
+                    "mixHash" : "0x392f7d0068c91c370e86b9747b418f63566263a0eef86f9946d5bb934be530e4",
+                    "nonce" : "0x85f812beae626fd7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05763bd13bd9594730206979d88adae615b7b9319650e50034837c8fcd3bf3fd688e05565e9485389cdf85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0392f7d0068c91c370e86b9747b418f63566263a0eef86f9946d5bb934be530e48885f812beae626fd7f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e07c1746d820806ef8c254efabe30e36023aa4b9179e4bda312713df44ccbd4",
+        "lastblockhash" : "0xccb8b7ae2f7d56ea62a875c07b82987139d34ceb1d606d14527cde5c52df7b87",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d25g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4bc574577aa5d2b1442a2834c2e4a365e22d1dee24c8afcd969086e492246e46",
-                    "mixHash" : "0x31b88628288c82ece0687ee383506cda641100d0c1f1356ff437538598052aaf",
-                    "nonce" : "0xedab1f3aa276aac4",
+                    "hash" : "0xa9182db7fed4caf38d0681d300e8938df1090f068e9be54390a924b7f215fb5e",
+                    "mixHash" : "0x7d98aa41f2f82e15367d3689d83d39dd8fbca5213b06ec16fdd3a76b14a00b11",
+                    "nonce" : "0x8069d49a93e9400d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a031b88628288c82ece0687ee383506cda641100d0c1f1356ff437538598052aaf88edab1f3aa276aac4f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07d98aa41f2f82e15367d3689d83d39dd8fbca5213b06ec16fdd3a76b14a00b11888069d49a93e9400df85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4bc574577aa5d2b1442a2834c2e4a365e22d1dee24c8afcd969086e492246e46",
+        "lastblockhash" : "0xa9182db7fed4caf38d0681d300e8938df1090f068e9be54390a924b7f215fb5e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d25g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xadf5a5b8d4b66ad248f94a81d61f6363ad4a4b1672b8cd93d7f42e6f66cd7c22",
-                    "mixHash" : "0x0bb6c681127c431fe32cadfdff640c087c5539f005a9bc97b1bf830508fe77ab",
-                    "nonce" : "0xb8a2db7088524f4d",
+                    "hash" : "0xbe04807bdfaaf7ffcfaa056705d0e1764206a1ad6f9fc84cf51cd46672490182",
+                    "mixHash" : "0x32bc3ebc003a3db6c5361fbd5893838c37fdd0e221c22e39d310cdb14a0f8d84",
+                    "nonce" : "0x2a1e591647ae9dfe",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00bb6c681127c431fe32cadfdff640c087c5539f005a9bc97b1bf830508fe77ab88b8a2db7088524f4df85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032bc3ebc003a3db6c5361fbd5893838c37fdd0e221c22e39d310cdb14a0f8d84882a1e591647ae9dfef85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadf5a5b8d4b66ad248f94a81d61f6363ad4a4b1672b8cd93d7f42e6f66cd7c22",
+        "lastblockhash" : "0xbe04807bdfaaf7ffcfaa056705d0e1764206a1ad6f9fc84cf51cd46672490182",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d25g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x000a7bbfdfa0379c08b89f2f6f0c88de3d3c7494df3788020656427727e6fad9",
-                    "mixHash" : "0xd2436b8e17c206dfcc884d8018d0069b24bf86afc457059dc32d8ffdc5924c93",
-                    "nonce" : "0xda30857462adb3bd",
+                    "hash" : "0xf5dbe847c7d687432c41f0aa56863bd2b63c5a12f71c9e3fababc9f6f4d173af",
+                    "mixHash" : "0x053fc84df3d3ca735c5d208fb2a34cd020c35773efb7d795499134ebff3a5865",
+                    "nonce" : "0xe068e4a49756b741",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d2436b8e17c206dfcc884d8018d0069b24bf86afc457059dc32d8ffdc5924c9388da30857462adb3bdf85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0053fc84df3d3ca735c5d208fb2a34cd020c35773efb7d795499134ebff3a586588e068e4a49756b741f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x000a7bbfdfa0379c08b89f2f6f0c88de3d3c7494df3788020656427727e6fad9",
+        "lastblockhash" : "0xf5dbe847c7d687432c41f0aa56863bd2b63c5a12f71c9e3fababc9f6f4d173af",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d25g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x95753d203c65352eef810008c13990432d42ae63fc7a568ad9babd2515311c49",
-                    "mixHash" : "0x318214539d0f8773a1b0e3879d396dbae9f5921ef50ac982585517e5a715b6bb",
-                    "nonce" : "0xd4aedf052843ef74",
+                    "hash" : "0x3d064b9b0659692cd7ea3d720128ad82ee5ab8e7a7171bd828fa8a44daf3f33f",
+                    "mixHash" : "0x4e185633f79261bb9d4f3ff3ab73146d8abeb8f1af8fe9715018c6feffd55e49",
+                    "nonce" : "0x493b1567a004706e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0318214539d0f8773a1b0e3879d396dbae9f5921ef50ac982585517e5a715b6bb88d4aedf052843ef74f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e185633f79261bb9d4f3ff3ab73146d8abeb8f1af8fe9715018c6feffd55e4988493b1567a004706ef85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95753d203c65352eef810008c13990432d42ae63fc7a568ad9babd2515311c49",
+        "lastblockhash" : "0x3d064b9b0659692cd7ea3d720128ad82ee5ab8e7a7171bd828fa8a44daf3f33f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d25g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d25g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7f61f0ee359055fb4cf040f35634f85b052b2d7b493a8ff690c208d2cfe7cdf3",
-                    "mixHash" : "0xe8aefb1de1b08f5bf3f43e842c340bc3f08cdeee8f3c1b3e89dca5ffa85220f3",
-                    "nonce" : "0xfa80e9ede4500ae6",
+                    "hash" : "0xf291d4dbc423e4d28c2da21a0d258f0c1a7ad219a3bd4c2994d05e2d65656ae4",
+                    "mixHash" : "0xe53bd40bcfeb1965d6c92452c95a91cc9756234ce6f29c8757186ad15af08270",
+                    "nonce" : "0x13be3ff372a34e18",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e8aefb1de1b08f5bf3f43e842c340bc3f08cdeee8f3c1b3e89dca5ffa85220f388fa80e9ede4500ae6f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bfb76ede261df9f349e62f68b179a5ffbd4eb75d472e0b0aba4ffcbbcabb371aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e53bd40bcfeb1965d6c92452c95a91cc9756234ce6f29c8757186ad15af082708813be3ff372a34e18f85ff85d800183061a8080830186a08e60016001600160013f60006000f31ca019ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7a02b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160013f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f61f0ee359055fb4cf040f35634f85b052b2d7b493a8ff690c208d2cfe7cdf3",
+        "lastblockhash" : "0xf291d4dbc423e4d28c2da21a0d258f0c1a7ad219a3bd4c2994d05e2d65656ae4",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0.json
index e483abb70..4856e49d5 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d26g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xba13db6371dbbf234acefccb470278488b81cb0c7d9c57a9ba1b008d6508ddf0",
-                    "mixHash" : "0x715d0ca597ca5638393a4c07cc37e30cca2f164b457b0432315779c658340e7d",
-                    "nonce" : "0x4db3114f6c0336dc",
+                    "hash" : "0x790cc1791becb4aa1c8edbe532454dd66c65d60a8713e1cd7487b59f639331f8",
+                    "mixHash" : "0x75f55762a81db005703d51da8eca3c0bf5086e5548630876978f62d083d12f25",
+                    "nonce" : "0xaad501034d10b7eb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0715d0ca597ca5638393a4c07cc37e30cca2f164b457b0432315779c658340e7d884db3114f6c0336dcf85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a075f55762a81db005703d51da8eca3c0bf5086e5548630876978f62d083d12f2588aad501034d10b7ebf85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba13db6371dbbf234acefccb470278488b81cb0c7d9c57a9ba1b008d6508ddf0",
+        "lastblockhash" : "0x790cc1791becb4aa1c8edbe532454dd66c65d60a8713e1cd7487b59f639331f8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d26g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb428233de4a1bbe0c8ea991cd757e2f1096732c4ec3c38275e3b6e488b561a26",
-                    "mixHash" : "0x2b814a771e6a74031f6f666765ed1e06ffea14e4dbfe86ec58a9cd76d4d5d5dd",
-                    "nonce" : "0x87d3feac243098c6",
+                    "hash" : "0x16db8ab8dba083356235e589e10bd4ee48274be5f5eeebd698b03548b6115419",
+                    "mixHash" : "0xe350dbf82214c216c1fd3faa9259215631d0284b52b7208ae906a5558081ea75",
+                    "nonce" : "0x6f85c6469cf0c5d7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b814a771e6a74031f6f666765ed1e06ffea14e4dbfe86ec58a9cd76d4d5d5dd8887d3feac243098c6f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e350dbf82214c216c1fd3faa9259215631d0284b52b7208ae906a5558081ea75886f85c6469cf0c5d7f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb428233de4a1bbe0c8ea991cd757e2f1096732c4ec3c38275e3b6e488b561a26",
+        "lastblockhash" : "0x16db8ab8dba083356235e589e10bd4ee48274be5f5eeebd698b03548b6115419",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d26g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc6d2efc8906947fd4a1b2242803a6e75eb77a441009d16c6b91d5bfe63e55e6b",
-                    "mixHash" : "0x255e164a9f8245f52964b18e37fc4fb7fdefc5b3641bd4ac49f36d309ef1c065",
-                    "nonce" : "0x2380703bcb2b2af6",
+                    "hash" : "0x1129540b26a86653730a191d23da847935962460e7056ab3f7df81a16165cf15",
+                    "mixHash" : "0xf97738609906e902612f49be3082ff4fe78fa25f84c297f40f62cbe0338288b0",
+                    "nonce" : "0x084532208806260c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0255e164a9f8245f52964b18e37fc4fb7fdefc5b3641bd4ac49f36d309ef1c065882380703bcb2b2af6f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f97738609906e902612f49be3082ff4fe78fa25f84c297f40f62cbe0338288b088084532208806260cf85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6d2efc8906947fd4a1b2242803a6e75eb77a441009d16c6b91d5bfe63e55e6b",
+        "lastblockhash" : "0x1129540b26a86653730a191d23da847935962460e7056ab3f7df81a16165cf15",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d26g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2c10a51fbf96ea238120de50d969991d2b4619e20d1e2f43ef7a416f4c5b3944",
-                    "mixHash" : "0xb4c5b1158dd2eda6b444684638255443f2a82efe71099e313943f4c5ff4e870e",
-                    "nonce" : "0xfa63b9ed6f78c82a",
+                    "hash" : "0x222e63b521835548c86ddf2b3e7c0a528cb051729b1a7ba04e42799a3fbc3414",
+                    "mixHash" : "0x2b1bc3663b63ad4450c89d2e5d25646dfb8e8d68d286178d594d897838a431e6",
+                    "nonce" : "0x3f1fe78488fd8e41",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b4c5b1158dd2eda6b444684638255443f2a82efe71099e313943f4c5ff4e870e88fa63b9ed6f78c82af85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b1bc3663b63ad4450c89d2e5d25646dfb8e8d68d286178d594d897838a431e6883f1fe78488fd8e41f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c10a51fbf96ea238120de50d969991d2b4619e20d1e2f43ef7a416f4c5b3944",
+        "lastblockhash" : "0x222e63b521835548c86ddf2b3e7c0a528cb051729b1a7ba04e42799a3fbc3414",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d26g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcf80f7e5c6a19f67ddb298c51f2eefad5256b688f262a981ab31d05d99364097",
-                    "mixHash" : "0x3c9cc7a75932b5ce255da7b2cb6691e0e90f4fcb3811348ad40ba765fa46cd80",
-                    "nonce" : "0x1bf038764bc74704",
+                    "hash" : "0x09d4434985d36146eb16a70aace94d8dd2a4901097512c62691f8043e4f75391",
+                    "mixHash" : "0xcbbd3f44a21585c4b02c83137e2b3a8cb8756f974a42753b056d4d47aaff9c41",
+                    "nonce" : "0x517d5df4af266bf0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03c9cc7a75932b5ce255da7b2cb6691e0e90f4fcb3811348ad40ba765fa46cd80881bf038764bc74704f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cbbd3f44a21585c4b02c83137e2b3a8cb8756f974a42753b056d4d47aaff9c4188517d5df4af266bf0f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf80f7e5c6a19f67ddb298c51f2eefad5256b688f262a981ab31d05d99364097",
+        "lastblockhash" : "0x09d4434985d36146eb16a70aace94d8dd2a4901097512c62691f8043e4f75391",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d26g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d26g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3439f5667c8d6dbfc347b3cfa7a09de7c5ffca8bcc49333f313cebdf2a134c35",
-                    "mixHash" : "0xd217c8f2d25222d2ffb6d57e3d5976e6518778da546baf44a944dcb16adbf0c1",
-                    "nonce" : "0x7ccd57640a3dc246",
+                    "hash" : "0x5146bab7166e2bf5befbea91e0e759ca7bae3b50f4246a8b0a63531ea9d3a0a8",
+                    "mixHash" : "0x3aea8a28cfcebda122435325a59eda48c94a5c4f3b6b7e97662745ffc1abbf47",
+                    "nonce" : "0x1e79746b9adeb41b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x6631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d217c8f2d25222d2ffb6d57e3d5976e6518778da546baf44a944dcb16adbf0c1887ccd57640a3dc246f85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06631122066d18a0c73a554c3c7b0ef16d02e7a37dafaf932b5a18fd3c748253da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03aea8a28cfcebda122435325a59eda48c94a5c4f3b6b7e97662745ffc1abbf47881e79746b9adeb41bf85ff85d800183061a8080830186a08e60016001600160014660006000f31ca0ae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18a00352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3439f5667c8d6dbfc347b3cfa7a09de7c5ffca8bcc49333f313cebdf2a134c35",
+        "lastblockhash" : "0x5146bab7166e2bf5befbea91e0e759ca7bae3b50f4246a8b0a63531ea9d3a0a8",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0.json
index b6d8abc41..fa5808cf3 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d27g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0634c2b28cb4501c90ec8090e3f2e72dff11c5fb0aa2c826fc9f926e491ff409",
-                    "mixHash" : "0x5b9e19ec1bc53e5dd509f377b8d8b80490dc449c68b91b3689fc65e9de345807",
-                    "nonce" : "0x8e232edf66f2b520",
+                    "hash" : "0x5d29591130047bb3d5c6340f15a59bbb3b278addbc0d76fbfbd7670bee9f24f9",
+                    "mixHash" : "0xa1cdc9cf8f2fcae0e67388ba23cc652655a8573c145bbb0f8c8e005c8606670d",
+                    "nonce" : "0xda3f1f6db81205c7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b9e19ec1bc53e5dd509f377b8d8b80490dc449c68b91b3689fc65e9de345807888e232edf66f2b520f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a1cdc9cf8f2fcae0e67388ba23cc652655a8573c145bbb0f8c8e005c8606670d88da3f1f6db81205c7f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0634c2b28cb4501c90ec8090e3f2e72dff11c5fb0aa2c826fc9f926e491ff409",
+        "lastblockhash" : "0x5d29591130047bb3d5c6340f15a59bbb3b278addbc0d76fbfbd7670bee9f24f9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d27g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd4c636dcd24e788150280c227a4bc6b65a70a33dc31c42bfa3166766b9cb16e7",
-                    "mixHash" : "0xd040b77f14bfae0d3845f0b7e8909a64e903019aa7af8119ba04eba5ba6940c6",
-                    "nonce" : "0x5f24a5c59f64e862",
+                    "hash" : "0x751655564cebcfa72b1360dbce2556ea83500662eeba5254d3f2ec5bc1e7df51",
+                    "mixHash" : "0xd7c4034a821d74cfd2dc989936e77b61cb1720af8a2c3360777a7d84710af1c0",
+                    "nonce" : "0xb0219f83733a41c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d040b77f14bfae0d3845f0b7e8909a64e903019aa7af8119ba04eba5ba6940c6885f24a5c59f64e862f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d7c4034a821d74cfd2dc989936e77b61cb1720af8a2c3360777a7d84710af1c088b0219f83733a41c0f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4c636dcd24e788150280c227a4bc6b65a70a33dc31c42bfa3166766b9cb16e7",
+        "lastblockhash" : "0x751655564cebcfa72b1360dbce2556ea83500662eeba5254d3f2ec5bc1e7df51",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d27g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x49b4e457cfbb69bb7899cf48aede708b47c933bd14dfdc63665b8c7c80097294",
-                    "mixHash" : "0x261e479c14fc8096e1f5173fe66bd1e619d4b4730d6f16bfba03c685be0c1229",
-                    "nonce" : "0xdf683cc5cf239d9b",
+                    "hash" : "0xd2f99cbf61dcc763f5e8d4ce9fda8c3399edb7c290a34e897ac59d9a3257aaac",
+                    "mixHash" : "0xd5eb17337e0a380abc7fe559def3fc986c78aa3db11cd05f72f99eae53fec8ae",
+                    "nonce" : "0x091e679623adebe1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0261e479c14fc8096e1f5173fe66bd1e619d4b4730d6f16bfba03c685be0c122988df683cc5cf239d9bf85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d5eb17337e0a380abc7fe559def3fc986c78aa3db11cd05f72f99eae53fec8ae88091e679623adebe1f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49b4e457cfbb69bb7899cf48aede708b47c933bd14dfdc63665b8c7c80097294",
+        "lastblockhash" : "0xd2f99cbf61dcc763f5e8d4ce9fda8c3399edb7c290a34e897ac59d9a3257aaac",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d27g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5e8d0c10f66eb32bbda8f42ad31e872a25dd4c2cc18f1390c0d5a5dd635efcaa",
-                    "mixHash" : "0x2ed80c245499c649cb3c4a58dd006cf0afb9d755028b1be6600b4f5b7b3bcd73",
-                    "nonce" : "0x9edcb26605b88b3b",
+                    "hash" : "0x689601ac7b62c0eda029f550a48b79af1f55fbbd1534efcb8717844f0775016e",
+                    "mixHash" : "0x17dd0539b5982cd9eee1379245af0a2a03fb49d11597fb02ff099782a1ccedbd",
+                    "nonce" : "0x04402cc485c24587",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ed80c245499c649cb3c4a58dd006cf0afb9d755028b1be6600b4f5b7b3bcd73889edcb26605b88b3bf85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017dd0539b5982cd9eee1379245af0a2a03fb49d11597fb02ff099782a1ccedbd8804402cc485c24587f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e8d0c10f66eb32bbda8f42ad31e872a25dd4c2cc18f1390c0d5a5dd635efcaa",
+        "lastblockhash" : "0x689601ac7b62c0eda029f550a48b79af1f55fbbd1534efcb8717844f0775016e",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d27g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa75321816ad4aa7725bd6570af34fa968abb96849fcb09736ddd436d80ab045c",
-                    "mixHash" : "0xe3d21cf1f92098dcc4b629f8b28e81a11e48cd305cfe2548a5ca94c04db1972f",
-                    "nonce" : "0xefc6aefc488984ac",
+                    "hash" : "0x887ead171ebd858dc709bbc4e48d6212e300275868835902bb1012109da42419",
+                    "mixHash" : "0xbef82c58994fa9c52a35057a4c3936f905784b19125cef9d70008e1058eb6f1d",
+                    "nonce" : "0xaa5312a3b1322503",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e3d21cf1f92098dcc4b629f8b28e81a11e48cd305cfe2548a5ca94c04db1972f88efc6aefc488984acf85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bef82c58994fa9c52a35057a4c3936f905784b19125cef9d70008e1058eb6f1d88aa5312a3b1322503f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa75321816ad4aa7725bd6570af34fa968abb96849fcb09736ddd436d80ab045c",
+        "lastblockhash" : "0x887ead171ebd858dc709bbc4e48d6212e300275868835902bb1012109da42419",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d27g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d27g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9f90d4f5a3d26c494c190fca32b2bfc50e5bc5720e201854f5889fd92cf35f8e",
-                    "mixHash" : "0x91cd1f0ba6ac3b8ac276bd9ca068bce5c1749407d69b7ea354afb3da73831933",
-                    "nonce" : "0xd0481c26876b4250",
+                    "hash" : "0x2d1a04c2807c749a2fe3132a092fde7442db9dd68fa47f4c28b469af0681e48f",
+                    "mixHash" : "0x22b6bad5cf0a4c79311d3c154b56a56a91286bf144cb0e5af230d6591bdb2b29",
+                    "nonce" : "0xd075cab2151c8d40",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x9e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091cd1f0ba6ac3b8ac276bd9ca068bce5c1749407d69b7ea354afb3da7383193388d0481c26876b4250f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea09e132d6775779df0ed22044ff145fe8e2538b399f6a0092a968adb372528e87ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022b6bad5cf0a4c79311d3c154b56a56a91286bf144cb0e5af230d6591bdb2b2988d075cab2151c8d40f85ff85d800183061a8080830186a08e60016001600160014760006000f31ca03676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249a010513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f90d4f5a3d26c494c190fca32b2bfc50e5bc5720e201854f5889fd92cf35f8e",
+        "lastblockhash" : "0x2d1a04c2807c749a2fe3132a092fde7442db9dd68fa47f4c28b469af0681e48f",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0.json
index 2173573f4..c0da5fda9 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d28g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3e492ef4dbcb3349eff2572ece2725980c9153719f561f888988e50adb87d5e7",
-                    "mixHash" : "0x8fc2a2942d90931bcab638b2a79d68fea0092364e4ee8b628795e67ba27d5211",
-                    "nonce" : "0xe83f8160447893ea",
+                    "hash" : "0xf834bded2aa40bcd26d316b2194510997c1cb1c3c3b303058f78b6a808e378a8",
+                    "mixHash" : "0xc78803d79edc4ded521b720f67b3e8d9e4499930dcba60bf321a474b76520ce0",
+                    "nonce" : "0x7db4d16ce30eb7a1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08fc2a2942d90931bcab638b2a79d68fea0092364e4ee8b628795e67ba27d521188e83f8160447893eaf85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c78803d79edc4ded521b720f67b3e8d9e4499930dcba60bf321a474b76520ce0887db4d16ce30eb7a1f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e492ef4dbcb3349eff2572ece2725980c9153719f561f888988e50adb87d5e7",
+        "lastblockhash" : "0xf834bded2aa40bcd26d316b2194510997c1cb1c3c3b303058f78b6a808e378a8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d28g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa94877f95c393885366acfedc2f17121b6fe3572ad383a81b8dc51bc62e0c063",
-                    "mixHash" : "0x91d243f337b07bff11dc9b4f558593162f8cda6413d76fc44d8ed5a369fdac8c",
-                    "nonce" : "0x6c5d365c73835f1a",
+                    "hash" : "0xf9e6d7a4df7604f51b526c2f66e7428ea201ae64114d597bb89e723ec9b788db",
+                    "mixHash" : "0x2eda67d6779fa22c8adc0aeddb5abe54482e9ed9229c69104be5053055e1bf8a",
+                    "nonce" : "0xc67dc693f273e415",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091d243f337b07bff11dc9b4f558593162f8cda6413d76fc44d8ed5a369fdac8c886c5d365c73835f1af85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02eda67d6779fa22c8adc0aeddb5abe54482e9ed9229c69104be5053055e1bf8a88c67dc693f273e415f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa94877f95c393885366acfedc2f17121b6fe3572ad383a81b8dc51bc62e0c063",
+        "lastblockhash" : "0xf9e6d7a4df7604f51b526c2f66e7428ea201ae64114d597bb89e723ec9b788db",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d28g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6a17cb8ff71285003b67d219a594dd22bef5eafd84e3dfb000c10eddcf63f047",
-                    "mixHash" : "0x998863f7b29d957f7b9af46d38913a5822a881117b35a45819ff3a28d898f891",
-                    "nonce" : "0x854dfcdb5df4a0ba",
+                    "hash" : "0x931dd4760c5415b1ced9dfb4a13345d7c216ff0235b0e4db68b7aa684f162e99",
+                    "mixHash" : "0xac9251c64f766369bf9c05ee44d5c00a5a46a53559ee31e35d9bec7e934da833",
+                    "nonce" : "0x1b2e5cb99198e512",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0998863f7b29d957f7b9af46d38913a5822a881117b35a45819ff3a28d898f89188854dfcdb5df4a0baf85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac9251c64f766369bf9c05ee44d5c00a5a46a53559ee31e35d9bec7e934da833881b2e5cb99198e512f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a17cb8ff71285003b67d219a594dd22bef5eafd84e3dfb000c10eddcf63f047",
+        "lastblockhash" : "0x931dd4760c5415b1ced9dfb4a13345d7c216ff0235b0e4db68b7aa684f162e99",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d28g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf0d0ccb8e5092924d4f2ce49bdcc13a40e30d7a7ed1c7a55510946659e4de87c",
-                    "mixHash" : "0x69a31c1152464420fad4856886ad263931c7325312664a3e9fc43f168c8dcd05",
-                    "nonce" : "0x19310c5b79f68965",
+                    "hash" : "0xfcca5c132604d1b247a2284b60ddf60fc0ed25555e6578c28ac0423e411e976c",
+                    "mixHash" : "0x1cfe0254a0efee76aea004bffc369d210ea6f787335a9e28f8666eec450cdf5e",
+                    "nonce" : "0x433f4afbf83fbd8c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a069a31c1152464420fad4856886ad263931c7325312664a3e9fc43f168c8dcd058819310c5b79f68965f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01cfe0254a0efee76aea004bffc369d210ea6f787335a9e28f8666eec450cdf5e88433f4afbf83fbd8cf85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0d0ccb8e5092924d4f2ce49bdcc13a40e30d7a7ed1c7a55510946659e4de87c",
+        "lastblockhash" : "0xfcca5c132604d1b247a2284b60ddf60fc0ed25555e6578c28ac0423e411e976c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d28g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0fdd74b82204ca4198523f27e548e119e5d7513a9fefe78a22a204e0b7518a7a",
-                    "mixHash" : "0x091dc8206ae2b9ccea8b3f6736de006d0ebb746a8164321f59f6abf1302c1883",
-                    "nonce" : "0x0eb46934a6ce99a3",
+                    "hash" : "0xe82cffae0dff96cf90ab37faf55b17bb050f41fa2ad9bd194f327d18bd839b16",
+                    "mixHash" : "0xad8af5b9632694063fe3d680ef3d21264dfdce84d415f3b363aae4a02542530b",
+                    "nonce" : "0x803998417395b0f2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0091dc8206ae2b9ccea8b3f6736de006d0ebb746a8164321f59f6abf1302c1883880eb46934a6ce99a3f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ad8af5b9632694063fe3d680ef3d21264dfdce84d415f3b363aae4a02542530b88803998417395b0f2f85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fdd74b82204ca4198523f27e548e119e5d7513a9fefe78a22a204e0b7518a7a",
+        "lastblockhash" : "0xe82cffae0dff96cf90ab37faf55b17bb050f41fa2ad9bd194f327d18bd839b16",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d28g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d28g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x84100a610d120a5d9a298733ba8681a65a62b3aa7606d55c95efbeef8d184130",
-                    "mixHash" : "0xd06f1a0f2d9bb4f92c912fb7238bf71d24c12ea4c4f066c1a05787003e956d16",
-                    "nonce" : "0x4b682b807966452c",
+                    "hash" : "0x2ed6e470fd9423bb2fa87eac19f30c11a4c812589893e1c0c0440f46b413240b",
+                    "mixHash" : "0x25589c47ada8deb2305b981893fed9d45d3f56f1f40ab58de1754f15bde7cc5f",
+                    "nonce" : "0x04766410f21e028e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xd3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d06f1a0f2d9bb4f92c912fb7238bf71d24c12ea4c4f066c1a05787003e956d16884b682b807966452cf85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d3da4cf7748b1e52df57682cf56b6181c1e7264c0f362ccbfd77dc43b34b50a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a025589c47ada8deb2305b981893fed9d45d3f56f1f40ab58de1754f15bde7cc5f8804766410f21e028ef85ff85d800183061a8080830186a08e60016001600160014860006000f31ca05a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbda018e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84100a610d120a5d9a298733ba8681a65a62b3aa7606d55c95efbeef8d184130",
+        "lastblockhash" : "0x2ed6e470fd9423bb2fa87eac19f30c11a4c812589893e1c0c0440f46b413240b",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0.json
index 06592ade6..df122b0d1 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d29g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xae78fc1273fb23415ee7e19d3bb3f3fe3959c69299658730b8a3d16353efa247",
-                    "mixHash" : "0x95845126d07f9e6521a46c39daff747c247efdf173f0b145e28adf93e9b90b8b",
-                    "nonce" : "0xd263faee9a83a94e",
+                    "hash" : "0xfb764af35bd5df74a8edea228cb63256e0b3dde44f43cef8e02c9085ed1457d2",
+                    "mixHash" : "0x5f9aa723ce16026114f22c8b90ca60f1eac3f7f4d60a66e0bdc780a7f598ab23",
+                    "nonce" : "0xe99367a5bf602731",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a095845126d07f9e6521a46c39daff747c247efdf173f0b145e28adf93e9b90b8b88d263faee9a83a94ef85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05f9aa723ce16026114f22c8b90ca60f1eac3f7f4d60a66e0bdc780a7f598ab2388e99367a5bf602731f85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae78fc1273fb23415ee7e19d3bb3f3fe3959c69299658730b8a3d16353efa247",
+        "lastblockhash" : "0xfb764af35bd5df74a8edea228cb63256e0b3dde44f43cef8e02c9085ed1457d2",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d29g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdbf770f189d0a2b3f50df11fa4603281e8ff7faac97e119f4aa9189890585e08",
-                    "mixHash" : "0x2f7e901fbe2d8e46aa768d08d3728bd7601bc3dcf3ce116ca6ff457e7dcaa4a1",
-                    "nonce" : "0x5ef3edbd8a2acd64",
+                    "hash" : "0x8cc85ce677fa2ae521730c2923e466ee4f812bfacbc5b58614d2fa891f0bd59a",
+                    "mixHash" : "0xc3bf8ee4c3b9980c992f12184cd88fe0fefc8e42d9251e68205a6d74b5364479",
+                    "nonce" : "0xf77bf4573c1bd06b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02f7e901fbe2d8e46aa768d08d3728bd7601bc3dcf3ce116ca6ff457e7dcaa4a1885ef3edbd8a2acd64f85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c3bf8ee4c3b9980c992f12184cd88fe0fefc8e42d9251e68205a6d74b536447988f77bf4573c1bd06bf85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbf770f189d0a2b3f50df11fa4603281e8ff7faac97e119f4aa9189890585e08",
+        "lastblockhash" : "0x8cc85ce677fa2ae521730c2923e466ee4f812bfacbc5b58614d2fa891f0bd59a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d29g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2ffb8e41800dfc33ed6dd9c9ecb69e4c31540038fb2f895b52126405deabd56c",
-                    "mixHash" : "0x685ee3665ecd4e8fa47ebd23d3556bedbce196d5cce3598429f95f9b25e42023",
-                    "nonce" : "0x196536fa38644cbb",
+                    "hash" : "0x194cdd124b5e8576001f6b10fd3422a7f8f3b78077843f6bba525e996b8f180d",
+                    "mixHash" : "0x2f1347bbb63b9ade5aa9fa8adfd4872352e57038521dc168e7c3f4b72b8ebea2",
+                    "nonce" : "0x31faa1902a56ec2f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0685ee3665ecd4e8fa47ebd23d3556bedbce196d5cce3598429f95f9b25e4202388196536fa38644cbbf85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02f1347bbb63b9ade5aa9fa8adfd4872352e57038521dc168e7c3f4b72b8ebea28831faa1902a56ec2ff85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ffb8e41800dfc33ed6dd9c9ecb69e4c31540038fb2f895b52126405deabd56c",
+        "lastblockhash" : "0x194cdd124b5e8576001f6b10fd3422a7f8f3b78077843f6bba525e996b8f180d",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d29g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdd4540d4581a7296952adb1d13014a9d74e9f56024c751e764fc68c92cc255a2",
-                    "mixHash" : "0xe616727d5ac4e33132a9d7393db7c82359f6a6cc5cf87f273c8a6b6094e2f455",
-                    "nonce" : "0x328d45f41437cda5",
+                    "hash" : "0x6c1876d6dc1afef60ee57068f4869933f7b89a6ce788dbcf97065fb7c9f44422",
+                    "mixHash" : "0x3e90814203d27786c931c252146dc444ed18f77c2bf8dec999df2b47d0eed0ab",
+                    "nonce" : "0x547a1f78ebbb49a9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e616727d5ac4e33132a9d7393db7c82359f6a6cc5cf87f273c8a6b6094e2f45588328d45f41437cda5f85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03e90814203d27786c931c252146dc444ed18f77c2bf8dec999df2b47d0eed0ab88547a1f78ebbb49a9f85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd4540d4581a7296952adb1d13014a9d74e9f56024c751e764fc68c92cc255a2",
+        "lastblockhash" : "0x6c1876d6dc1afef60ee57068f4869933f7b89a6ce788dbcf97065fb7c9f44422",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d29g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6ceea93c70a4c2c53d1fc0f795f643ca0f72db1c326370114733e13790f37513",
-                    "mixHash" : "0xb0d6ca9d6aaf51a7dd0ed18e24041f1b0efbb3dad5bd5b70634bb62c24b4279d",
-                    "nonce" : "0xf5b03dcc8f7b082a",
+                    "hash" : "0x4c0ddfb1ed549f3440d01aac2d04fdf58964afdee6b108298bf51691c4cd5e4e",
+                    "mixHash" : "0x213e89b38d5c634a41ffec7e5c73acafd36f625ab9d7180eb53d1660eff57512",
+                    "nonce" : "0x5096262ab132f9db",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0d6ca9d6aaf51a7dd0ed18e24041f1b0efbb3dad5bd5b70634bb62c24b4279d88f5b03dcc8f7b082af85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0213e89b38d5c634a41ffec7e5c73acafd36f625ab9d7180eb53d1660eff57512885096262ab132f9dbf85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ceea93c70a4c2c53d1fc0f795f643ca0f72db1c326370114733e13790f37513",
+        "lastblockhash" : "0x4c0ddfb1ed549f3440d01aac2d04fdf58964afdee6b108298bf51691c4cd5e4e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d29g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d29g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe19010bb9c5d2554228c23dc58120ddb429ca62772d9ef48c1c64e7daf749a4a",
-                    "mixHash" : "0xb05cd1d03aae64662a02938ea0ec345690fc653b074ee49581a1ff64eba25a7f",
-                    "nonce" : "0x6270c9077306d455",
+                    "hash" : "0x39e9863d741787066d7ad2e5a3a7b3cf083d9fb4725474524288a72fd6e97660",
+                    "mixHash" : "0x7e2896f243e10f8d37ceea635f284a8d3f902bbf03e428e96e5cb44d45f00505",
+                    "nonce" : "0x6b0d57eab3d57deb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b05cd1d03aae64662a02938ea0ec345690fc653b074ee49581a1ff64eba25a7f886270c9077306d455f85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b21ef8873c349f90eaaaddcc8ab5b6d6768f38d330636c8ff564a84cf0be4ca2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07e2896f243e10f8d37ceea635f284a8d3f902bbf03e428e96e5cb44d45f00505886b0d57eab3d57debf85ff85d800183061a8080830186a08e60016001600160014960006000f31ba0b8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cfa05f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe19010bb9c5d2554228c23dc58120ddb429ca62772d9ef48c1c64e7daf749a4a",
+        "lastblockhash" : "0x39e9863d741787066d7ad2e5a3a7b3cf083d9fb4725474524288a72fd6e97660",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0.json
index 7c2ded3d4..9e2edc902 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d2g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xed3cdb51e4931790dca5b677c617d228a00c9965cc552bd5d75a35fd52cf4e33",
-                    "mixHash" : "0x47e28f8c42851af7aec3ea365ae82503f6c3d3631c2c07b7b23a2828ba72a2aa",
-                    "nonce" : "0x6e1862e4ee272d82",
+                    "hash" : "0xd93acc9a8175d4973e477294498f14f2a6f10a607055392ebf340c3636638c78",
+                    "mixHash" : "0xec003b3b8da8b969e7514f0221c504f9d30b0b9f88f1b01d57c7a21501a15967",
+                    "nonce" : "0xc81f5a3f17855e2c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a047e28f8c42851af7aec3ea365ae82503f6c3d3631c2c07b7b23a2828ba72a2aa886e1862e4ee272d82f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ec003b3b8da8b969e7514f0221c504f9d30b0b9f88f1b01d57c7a21501a1596788c81f5a3f17855e2cf85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed3cdb51e4931790dca5b677c617d228a00c9965cc552bd5d75a35fd52cf4e33",
+        "lastblockhash" : "0xd93acc9a8175d4973e477294498f14f2a6f10a607055392ebf340c3636638c78",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d2g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfdb2f217218747169e7dcdd4416c406e6651efd9b809410a74998e8f3f205182",
-                    "mixHash" : "0xc0af49cc9dc1724927c53ad4dbcbf64609af7bd032c90f3f199a5cee3e05ec54",
-                    "nonce" : "0xeff8f5b5238d49aa",
+                    "hash" : "0x0a0d6976dbdf8f11c12bc3e37bfff258706a4ed02f0a6ed2b707037793df3987",
+                    "mixHash" : "0xb66549578c4d6b522785c63493466a816e6f67da6389b52494f88b44de03957f",
+                    "nonce" : "0x286cd635d55858ab",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c0af49cc9dc1724927c53ad4dbcbf64609af7bd032c90f3f199a5cee3e05ec5488eff8f5b5238d49aaf85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b66549578c4d6b522785c63493466a816e6f67da6389b52494f88b44de03957f88286cd635d55858abf85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdb2f217218747169e7dcdd4416c406e6651efd9b809410a74998e8f3f205182",
+        "lastblockhash" : "0x0a0d6976dbdf8f11c12bc3e37bfff258706a4ed02f0a6ed2b707037793df3987",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d2g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x340203faf8376da6189ce47cbe44f91417e272e6d9959f678859689031851ba6",
-                    "mixHash" : "0xb91f65125e83958895f599331a97ef45d711bf354a5a1ec7fb91341403cc4349",
-                    "nonce" : "0x485af3a9aa0d8a8b",
+                    "hash" : "0x455c851007dbbd15aa32a37bc537f60dbd4847557304a715895d0664efc62999",
+                    "mixHash" : "0x4c6bf8bc8eeb246caeadf02680c038326d2d8c218077ace327caeb28d6ab0a68",
+                    "nonce" : "0xed18dc48d1204c8a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b91f65125e83958895f599331a97ef45d711bf354a5a1ec7fb91341403cc434988485af3a9aa0d8a8bf85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04c6bf8bc8eeb246caeadf02680c038326d2d8c218077ace327caeb28d6ab0a6888ed18dc48d1204c8af85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x340203faf8376da6189ce47cbe44f91417e272e6d9959f678859689031851ba6",
+        "lastblockhash" : "0x455c851007dbbd15aa32a37bc537f60dbd4847557304a715895d0664efc62999",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d2g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x01ef4436fe72d97311339c174e70041a928ae9ce4842abc51af63f19232cc9f7",
-                    "mixHash" : "0x4303306196d34aaa20508b3b5a6de730c439710392e81acab35fa902924fe3de",
-                    "nonce" : "0x15961c1554956927",
+                    "hash" : "0x600d5e0186629bb9947ed4925106cdecb74a7643b6f67cc7fabf64acd403698d",
+                    "mixHash" : "0xa7245f9237107b6e2435c1f9a80b2b3dff8f74cfac8d8eebe9c3b81178d7554a",
+                    "nonce" : "0xde6af4f4bec2e916",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04303306196d34aaa20508b3b5a6de730c439710392e81acab35fa902924fe3de8815961c1554956927f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a7245f9237107b6e2435c1f9a80b2b3dff8f74cfac8d8eebe9c3b81178d7554a88de6af4f4bec2e916f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01ef4436fe72d97311339c174e70041a928ae9ce4842abc51af63f19232cc9f7",
+        "lastblockhash" : "0x600d5e0186629bb9947ed4925106cdecb74a7643b6f67cc7fabf64acd403698d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d2g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x95ac1a36dfea05b16798660512a764b84263f8e6ab342f2e5a190daf9b82d613",
-                    "mixHash" : "0x936a4460b90ceaad44896680fecc41292090f0bda2c2ec54f5b59afedf3e1777",
-                    "nonce" : "0x1f237b9ba53215c6",
+                    "hash" : "0xa696a407f0bf01da14e3a4a2fcd3d404076e2a61d20b05449eb7885af1e6ae24",
+                    "mixHash" : "0xf503aa10d7a4e613f5ac04d3e1633c2069ac04ee07f3ca8725ea8df4ee370c72",
+                    "nonce" : "0xc25887f56255a07a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0936a4460b90ceaad44896680fecc41292090f0bda2c2ec54f5b59afedf3e1777881f237b9ba53215c6f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f503aa10d7a4e613f5ac04d3e1633c2069ac04ee07f3ca8725ea8df4ee370c7288c25887f56255a07af85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95ac1a36dfea05b16798660512a764b84263f8e6ab342f2e5a190daf9b82d613",
+        "lastblockhash" : "0xa696a407f0bf01da14e3a4a2fcd3d404076e2a61d20b05449eb7885af1e6ae24",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d2g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d2g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7ce63894da26a6f5d1db04e7d8ed1a55141cf415b5433431e8796df90e99ea44",
-                    "mixHash" : "0x09687f314f8bac7341d0ee07364b39170e46c0c6d34a5496525567008e541d7e",
-                    "nonce" : "0x1a69ba7145c235b1",
+                    "hash" : "0xcb8aa9fb17174e415b68c962d9fb16b86494ab1593117948f04adf5e468fc64e",
+                    "mixHash" : "0x5ac617bc118783a8026547c6dd1d2cc014ae4934f59bf2f2c22d386c6e7df47a",
+                    "nonce" : "0xb94f7a7b2a47ffc2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a009687f314f8bac7341d0ee07364b39170e46c0c6d34a5496525567008e541d7e881a69ba7145c235b1f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c90e86e9f748e644c19d51602174ca3f4a75cef2270ecfce43499d5fb98bd20ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05ac617bc118783a8026547c6dd1d2cc014ae4934f59bf2f2c22d386c6e7df47a88b94f7a7b2a47ffc2f85ff85d800183061a8080830186a08e60016001600160010d60006000f31ba0b77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3a02e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010d60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ce63894da26a6f5d1db04e7d8ed1a55141cf415b5433431e8796df90e99ea44",
+        "lastblockhash" : "0xcb8aa9fb17174e415b68c962d9fb16b86494ab1593117948f04adf5e468fc64e",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0.json
index ed322c2fa..41ab1d31f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d30g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfbb65f1dcb34a4bcc3a6b48106cb0e07b57578837d2178ce2943302292469b12",
-                    "mixHash" : "0xb51049f24a2ded1d5781dfc02b822bf3a2b92997d77523fe2a3c205bfc46c414",
-                    "nonce" : "0x867f6e7b80394070",
+                    "hash" : "0x74eda86be7b6e4c9e2664803c695d63227f9f913b3d53bed12f712f6bacedc7d",
+                    "mixHash" : "0xd4d8c1fa078e1c3efcd0e1fbbb911abf466014508b267b39be0cde04107a4e39",
+                    "nonce" : "0x4799c0d1b5240467",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b51049f24a2ded1d5781dfc02b822bf3a2b92997d77523fe2a3c205bfc46c41488867f6e7b80394070f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d4d8c1fa078e1c3efcd0e1fbbb911abf466014508b267b39be0cde04107a4e39884799c0d1b5240467f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbb65f1dcb34a4bcc3a6b48106cb0e07b57578837d2178ce2943302292469b12",
+        "lastblockhash" : "0x74eda86be7b6e4c9e2664803c695d63227f9f913b3d53bed12f712f6bacedc7d",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d30g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9e97c965fb450bab5c32e5a580f011936a37f38d983ef1b11328e195e1e016c7",
-                    "mixHash" : "0xa3d6d687ef9334fcb4466d220b817408891cc827e819a4979a79484f16ef2394",
-                    "nonce" : "0x94313e4932f0b5e7",
+                    "hash" : "0x635a1f8f101d6ddb25086b4709d58656fb0955d1247661ec9d1918ce3ef5ad28",
+                    "mixHash" : "0x3bca45224ce5b22400c2a57140d8a1a939572d0b74163015ea5140fc7472085c",
+                    "nonce" : "0xc4336833fda53133",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a3d6d687ef9334fcb4466d220b817408891cc827e819a4979a79484f16ef23948894313e4932f0b5e7f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03bca45224ce5b22400c2a57140d8a1a939572d0b74163015ea5140fc7472085c88c4336833fda53133f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e97c965fb450bab5c32e5a580f011936a37f38d983ef1b11328e195e1e016c7",
+        "lastblockhash" : "0x635a1f8f101d6ddb25086b4709d58656fb0955d1247661ec9d1918ce3ef5ad28",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d30g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc711f1338fe9d469fffce187d1b3bedf46128e14d138fa0eb3f3b32d7b5032f2",
-                    "mixHash" : "0x86f3c94afc5a999a7a048ce38e13a3cd12216b17ad62d3c0dc456da3e2e90a7e",
-                    "nonce" : "0x5952bed18d466d9c",
+                    "hash" : "0xcb01197d5c376de61934f9fe3feda0fdba8b0fcb623c232520fb675b9246ffef",
+                    "mixHash" : "0x2c060d17631f99f5bae04a7a2bd9198d8ccdd4fcd367e0b36c7758520292ad59",
+                    "nonce" : "0x6d4bdf84f24d4614",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a086f3c94afc5a999a7a048ce38e13a3cd12216b17ad62d3c0dc456da3e2e90a7e885952bed18d466d9cf85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c060d17631f99f5bae04a7a2bd9198d8ccdd4fcd367e0b36c7758520292ad59886d4bdf84f24d4614f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc711f1338fe9d469fffce187d1b3bedf46128e14d138fa0eb3f3b32d7b5032f2",
+        "lastblockhash" : "0xcb01197d5c376de61934f9fe3feda0fdba8b0fcb623c232520fb675b9246ffef",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d30g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6855f46a8cb85b4924176faabcf503a0f87ff763c4a90441661a91a834715459",
-                    "mixHash" : "0x7e3dc9c7e977d5eb69db963966f38f499caa40b555b4503f00c8bfe860041d7d",
-                    "nonce" : "0x016ff9d5537eec27",
+                    "hash" : "0x68ffb40afdf2cc4ec7e69e11b8228bd197494fe84d3fd4a65a888121b1107ff3",
+                    "mixHash" : "0x21a7e54eca6758254a74940615ad0f83cae476c7b8d8c3654d341a359000a3f2",
+                    "nonce" : "0x69b6857c0b58ca56",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07e3dc9c7e977d5eb69db963966f38f499caa40b555b4503f00c8bfe860041d7d88016ff9d5537eec27f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a021a7e54eca6758254a74940615ad0f83cae476c7b8d8c3654d341a359000a3f28869b6857c0b58ca56f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6855f46a8cb85b4924176faabcf503a0f87ff763c4a90441661a91a834715459",
+        "lastblockhash" : "0x68ffb40afdf2cc4ec7e69e11b8228bd197494fe84d3fd4a65a888121b1107ff3",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d30g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x802cce94276ee55282c98e5ca7b54346ed590c2fb4c6fa25a3398c81d6c3186f",
-                    "mixHash" : "0x32372bb2e124c4497815529cce8ee16d061ce21e4cd1bc9f607438702a729c72",
-                    "nonce" : "0x4dcc02c4190faa80",
+                    "hash" : "0xff3b95b8a879144ff7f929184515511ca3f42b14f94253a3af551f7c1e4667b9",
+                    "mixHash" : "0x23b74f7e9602c42c0276f7b7fb11ead45e3187850cdd9b92407a6a21b31023e1",
+                    "nonce" : "0xa6c07e10324647dc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032372bb2e124c4497815529cce8ee16d061ce21e4cd1bc9f607438702a729c72884dcc02c4190faa80f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a023b74f7e9602c42c0276f7b7fb11ead45e3187850cdd9b92407a6a21b31023e188a6c07e10324647dcf85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x802cce94276ee55282c98e5ca7b54346ed590c2fb4c6fa25a3398c81d6c3186f",
+        "lastblockhash" : "0xff3b95b8a879144ff7f929184515511ca3f42b14f94253a3af551f7c1e4667b9",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d30g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d30g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x966927145099f5546d8f7a2d5e3029cb9b41e2a1b8be9da07f8d42a6a8c0b61b",
-                    "mixHash" : "0x64b0492a5afd981901d4d0976e0cfd8f53e399cf6b51972cda5101965b232480",
-                    "nonce" : "0x2bd17b923ab635b1",
+                    "hash" : "0xc512b2f3e2f33bfe92730a8a1fc0a66b241db82c86f1734bdbb49b6c0e95744a",
+                    "mixHash" : "0x4a37743a5e359e9ded6329dc824156cd19b99ea8fc25c4e53a6ffee52f1e0cf0",
+                    "nonce" : "0xd6ba74d9bc410e32",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xa15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a064b0492a5afd981901d4d0976e0cfd8f53e399cf6b51972cda5101965b232480882bd17b923ab635b1f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a15291075a369b364c477671f80202ccf58c03df0584a6e31dec49a026d8b843a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04a37743a5e359e9ded6329dc824156cd19b99ea8fc25c4e53a6ffee52f1e0cf088d6ba74d9bc410e32f85ff85d800183061a8080830186a08e60016001600160014a60006000f31ca0ae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334a06cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181bac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014a60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x966927145099f5546d8f7a2d5e3029cb9b41e2a1b8be9da07f8d42a6a8c0b61b",
+        "lastblockhash" : "0xc512b2f3e2f33bfe92730a8a1fc0a66b241db82c86f1734bdbb49b6c0e95744a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0.json
index 6b44ebebd..331f8c233 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d31g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfbec77284ec4865106beed29eb626f84071e90599e6c27f54af83aff97ea1ad9",
-                    "mixHash" : "0x4642475806793365acdc8f9700308df61fac46f73c86ad20987764bfaf92653e",
-                    "nonce" : "0xb6001d7885899527",
+                    "hash" : "0xbb3c571887b201ac11a5def75dada1de76601c1d2b01ef9091a045b6312701fa",
+                    "mixHash" : "0x62e05d3f469a0c17f1ae9f39aba21288cfdfcdef300c5decf40f7b4244a6ce29",
+                    "nonce" : "0x7725912d5ed5b62a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04642475806793365acdc8f9700308df61fac46f73c86ad20987764bfaf92653e88b6001d7885899527f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a062e05d3f469a0c17f1ae9f39aba21288cfdfcdef300c5decf40f7b4244a6ce29887725912d5ed5b62af85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbec77284ec4865106beed29eb626f84071e90599e6c27f54af83aff97ea1ad9",
+        "lastblockhash" : "0xbb3c571887b201ac11a5def75dada1de76601c1d2b01ef9091a045b6312701fa",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d31g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdc9c5e307c938a9c2154ef2b968691e76cf5de5408bb700892b6fddc8a771200",
-                    "mixHash" : "0xcd2eb59e6d7b1020498bb338fd889e68c48d8dde91528023fbdedb76dee4489d",
-                    "nonce" : "0xdb12959461846e21",
+                    "hash" : "0x4d8430306994920ca0bd7b67dcf51efab2e326ffd495420432c19e68a660b6b3",
+                    "mixHash" : "0xefa284624069305826f85e27146f33f26183111fd0d219a983884626c940cb21",
+                    "nonce" : "0x6521b4e77b318603",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cd2eb59e6d7b1020498bb338fd889e68c48d8dde91528023fbdedb76dee4489d88db12959461846e21f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0efa284624069305826f85e27146f33f26183111fd0d219a983884626c940cb21886521b4e77b318603f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc9c5e307c938a9c2154ef2b968691e76cf5de5408bb700892b6fddc8a771200",
+        "lastblockhash" : "0x4d8430306994920ca0bd7b67dcf51efab2e326ffd495420432c19e68a660b6b3",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d31g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb86e70b671b90026ac3b9b5a5a05618ff459a1b4077c4518a7f179984325f6c8",
-                    "mixHash" : "0x27dadca790aecee0c94d1e2503b2227a914a7ffb85302632067c28495cebf729",
-                    "nonce" : "0x1877f726f6a966c9",
+                    "hash" : "0x5e2bd7fa5da4163a12d5ddf98b18f5899800b1d2d3e3d42fd91f93eb77c43d9c",
+                    "mixHash" : "0x907e8aa8bff7d60e0ce466be3bd09ce4341f349e3b84879c1eb480a91561c2a6",
+                    "nonce" : "0x4b9feb9a26467ab3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a027dadca790aecee0c94d1e2503b2227a914a7ffb85302632067c28495cebf729881877f726f6a966c9f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0907e8aa8bff7d60e0ce466be3bd09ce4341f349e3b84879c1eb480a91561c2a6884b9feb9a26467ab3f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb86e70b671b90026ac3b9b5a5a05618ff459a1b4077c4518a7f179984325f6c8",
+        "lastblockhash" : "0x5e2bd7fa5da4163a12d5ddf98b18f5899800b1d2d3e3d42fd91f93eb77c43d9c",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d31g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x677631f99a5069a8e9d3a7ebdc2c21c26ab191c31d338204b3c2a17662a05c55",
-                    "mixHash" : "0x58e8011464ed3edded8dd8c5862b4c61dcd9f5330a11287d8654a07ecbf9164f",
-                    "nonce" : "0xae1cc10f31ccfd03",
+                    "hash" : "0x1dd68604666e85db718be8e7068b603f160b5ecf114da47d5b5bf48aeab348be",
+                    "mixHash" : "0xcb8a5fd3403723d349c575c1de23a5e0c3fbe5078b6d34280f7790481c224e51",
+                    "nonce" : "0xd994c71ac60c3023",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a058e8011464ed3edded8dd8c5862b4c61dcd9f5330a11287d8654a07ecbf9164f88ae1cc10f31ccfd03f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cb8a5fd3403723d349c575c1de23a5e0c3fbe5078b6d34280f7790481c224e5188d994c71ac60c3023f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x677631f99a5069a8e9d3a7ebdc2c21c26ab191c31d338204b3c2a17662a05c55",
+        "lastblockhash" : "0x1dd68604666e85db718be8e7068b603f160b5ecf114da47d5b5bf48aeab348be",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d31g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa3fbbf4a946364c81f840a04cfd22716933dcdba1e3281b382fad7d29c9b5435",
-                    "mixHash" : "0x7714b477a434489f2ad0d03b6171acb85a65d9a160a0c7ba71a434793c61abcc",
-                    "nonce" : "0x03924451dc80696c",
+                    "hash" : "0xc03229adcd7fabc0d0884d8c46689300011ab04321bbb7b5192b53d868790410",
+                    "mixHash" : "0xecd1c5f7c17b5a35e1da2e1b790b1fea0995bf840006004c1218c597d15ecf0c",
+                    "nonce" : "0x976ca8deb06e947f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07714b477a434489f2ad0d03b6171acb85a65d9a160a0c7ba71a434793c61abcc8803924451dc80696cf85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ecd1c5f7c17b5a35e1da2e1b790b1fea0995bf840006004c1218c597d15ecf0c88976ca8deb06e947ff85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3fbbf4a946364c81f840a04cfd22716933dcdba1e3281b382fad7d29c9b5435",
+        "lastblockhash" : "0xc03229adcd7fabc0d0884d8c46689300011ab04321bbb7b5192b53d868790410",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d31g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d31g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe813303d4f193decf494f6bb01a9eb38b9226eab59dc8eeac1b6e7fdcaa9ed1f",
-                    "mixHash" : "0xa0613a2728f9eee42f58c0588c6721c8e4a81082bd7d1a1d082230beca720804",
-                    "nonce" : "0x4102a91ec6ba8fb5",
+                    "hash" : "0xac2dd21bb374322615c19c759401f0af52c54a42bce8df2bb8e4e45277e4c8e6",
+                    "mixHash" : "0x8ee8c5ac96ff20f8b468167f2c1c39886645578fb114d253181f84d572ffe595",
+                    "nonce" : "0x170eae957248bdff",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x6067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a0613a2728f9eee42f58c0588c6721c8e4a81082bd7d1a1d082230beca720804884102a91ec6ba8fb5f85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea06067eae232bcb60806374f335331ef7a233da4cddb41ec29fdbda75c324a52d4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08ee8c5ac96ff20f8b468167f2c1c39886645578fb114d253181f84d572ffe59588170eae957248bdfff85ff85d800183061a8080830186a08e60016001600160014b60006000f31ba07707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107a04f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014b60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe813303d4f193decf494f6bb01a9eb38b9226eab59dc8eeac1b6e7fdcaa9ed1f",
+        "lastblockhash" : "0xac2dd21bb374322615c19c759401f0af52c54a42bce8df2bb8e4e45277e4c8e6",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0.json
index b2b0fac3b..9e8e643d2 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d32g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x30f1cba78f0549c137025a46d52a001e1cf0b2405851efef64a2503f20062805",
-                    "mixHash" : "0x19e9cfb70e26d49877903e07e47a67fe26bb22de5132a6148b6db6d707d15586",
-                    "nonce" : "0x6d546e16b56253dc",
+                    "hash" : "0xb006e70fa42bd30057cca0b764f0dcdb6f398468e3513cb0f5d1b2133b8429b1",
+                    "mixHash" : "0x9ea0e162e7c4f1964510f8abb55aaeffc978d344ea671cf306bd9c51f5707f83",
+                    "nonce" : "0x778422ec0b6f48f5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a019e9cfb70e26d49877903e07e47a67fe26bb22de5132a6148b6db6d707d15586886d546e16b56253dcf85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09ea0e162e7c4f1964510f8abb55aaeffc978d344ea671cf306bd9c51f5707f8388778422ec0b6f48f5f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30f1cba78f0549c137025a46d52a001e1cf0b2405851efef64a2503f20062805",
+        "lastblockhash" : "0xb006e70fa42bd30057cca0b764f0dcdb6f398468e3513cb0f5d1b2133b8429b1",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d32g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x19daae0d49a4675a5a9e00f73075571b5b9fd857922e53cf9a738ebd03a68936",
-                    "mixHash" : "0x8710fb1d271ce4236d740360937be07fdd2744403c0295fe459431441a0a98a1",
-                    "nonce" : "0x4f39dc11b07ae932",
+                    "hash" : "0xf14b363c7770b990298b4e03d34a728ff597a2c295c53fa1c1b02bcf7d2d45dd",
+                    "mixHash" : "0x644144b7a10925bdf680f9fc3ddf503ba6a02eef61dd01dba5d71490adcc3c41",
+                    "nonce" : "0x982e48b5803e9a15",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08710fb1d271ce4236d740360937be07fdd2744403c0295fe459431441a0a98a1884f39dc11b07ae932f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0644144b7a10925bdf680f9fc3ddf503ba6a02eef61dd01dba5d71490adcc3c4188982e48b5803e9a15f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19daae0d49a4675a5a9e00f73075571b5b9fd857922e53cf9a738ebd03a68936",
+        "lastblockhash" : "0xf14b363c7770b990298b4e03d34a728ff597a2c295c53fa1c1b02bcf7d2d45dd",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d32g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x848911873fe159a3e7ef10261020576f948007364bae7e5f3905c52bbd4a3125",
-                    "mixHash" : "0x7d8a991afbeaf22e636a4afe45aa7b550e0a2c97fa668209a5542175eb37eb3a",
-                    "nonce" : "0xcaa269ddc0fffe38",
+                    "hash" : "0x6a4b61b8f555c261f75c277346cc2c25b4cd5fa3d848496cf4eb20089e7be4da",
+                    "mixHash" : "0x649c47c7f7c8fd005df90b7a68484ff91be2ecc4aa25c12cae39c67a574e54b7",
+                    "nonce" : "0x686e94c89feb4efd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07d8a991afbeaf22e636a4afe45aa7b550e0a2c97fa668209a5542175eb37eb3a88caa269ddc0fffe38f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0649c47c7f7c8fd005df90b7a68484ff91be2ecc4aa25c12cae39c67a574e54b788686e94c89feb4efdf85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x848911873fe159a3e7ef10261020576f948007364bae7e5f3905c52bbd4a3125",
+        "lastblockhash" : "0x6a4b61b8f555c261f75c277346cc2c25b4cd5fa3d848496cf4eb20089e7be4da",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d32g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x29d4c2d954dcb743978ca8d9f90b93dc0a24ff022723ded544b518df322e1593",
-                    "mixHash" : "0x7d22ce9eb7c40a2d8ec8d95ce5904efade323af54ac5b2e56b44b73ca1c221d7",
-                    "nonce" : "0xb5cbf0d10a3bd41a",
+                    "hash" : "0xb3829f77fe6414c12e12cd65d56d837494150a5b880a31087e0168b6f59b4832",
+                    "mixHash" : "0xab28d6d22877562adf4d7088767741770cc3c9af40cf09efb2a5081c4a6fe38c",
+                    "nonce" : "0x84b5ab0e28ce6f39",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07d22ce9eb7c40a2d8ec8d95ce5904efade323af54ac5b2e56b44b73ca1c221d788b5cbf0d10a3bd41af85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab28d6d22877562adf4d7088767741770cc3c9af40cf09efb2a5081c4a6fe38c8884b5ab0e28ce6f39f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29d4c2d954dcb743978ca8d9f90b93dc0a24ff022723ded544b518df322e1593",
+        "lastblockhash" : "0xb3829f77fe6414c12e12cd65d56d837494150a5b880a31087e0168b6f59b4832",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d32g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc70950db95327618374926a8e6c28703d9fd7ea82eb5fcfd0dc38f6070b485e8",
-                    "mixHash" : "0x427eb1545cd579c6e936b2da83739ed4a9a2d85fe185cfa158bdd9460f4ef126",
-                    "nonce" : "0x212dd35fcd6d1952",
+                    "hash" : "0x6071be0a64efc02b85c8d2b5087021f7b62570778f5a79f8d9df434445a96b1d",
+                    "mixHash" : "0x38070d1ad424cddc82743c92c2564b45695a437ff7692ee000255a19f821740e",
+                    "nonce" : "0x577d9416170cf067",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0427eb1545cd579c6e936b2da83739ed4a9a2d85fe185cfa158bdd9460f4ef12688212dd35fcd6d1952f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a038070d1ad424cddc82743c92c2564b45695a437ff7692ee000255a19f821740e88577d9416170cf067f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc70950db95327618374926a8e6c28703d9fd7ea82eb5fcfd0dc38f6070b485e8",
+        "lastblockhash" : "0x6071be0a64efc02b85c8d2b5087021f7b62570778f5a79f8d9df434445a96b1d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d32g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d32g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x181cbee0669cdcccb2730254711f9d08ffd002a8977896fb50d4ed4f6ad86b37",
-                    "mixHash" : "0xbcd578137d31a31e120285ef2faceac1358772e237f7da91240380b29a587f87",
-                    "nonce" : "0x65807ec2328e874a",
+                    "hash" : "0x7104d7f03305ab3009d7c647999b9dacdb0950a57516379025920f4e7c6fb5db",
+                    "mixHash" : "0x374a3bc98f9c15a9791eda6f4e3b20fccfaa1137783e9046a3702f9dd51a528e",
+                    "nonce" : "0xd7f4389231ecc8d0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x8e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bcd578137d31a31e120285ef2faceac1358772e237f7da91240380b29a587f878865807ec2328e874af85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e18ff7e35618b4b01d951247f6198d66a99d5c4fd3b013b70c99a3d0aebf13ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0374a3bc98f9c15a9791eda6f4e3b20fccfaa1137783e9046a3702f9dd51a528e88d7f4389231ecc8d0f85ff85d800183061a8080830186a08e60016001600160014c60006000f31ca0c03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62a051f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014c60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x181cbee0669cdcccb2730254711f9d08ffd002a8977896fb50d4ed4f6ad86b37",
+        "lastblockhash" : "0x7104d7f03305ab3009d7c647999b9dacdb0950a57516379025920f4e7c6fb5db",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0.json
index 162873999..7158ef2ca 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d33g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcc74d18a869085cf84f64b2d6624ce5063944666f9ea47f781c3a95b0a56044f",
-                    "mixHash" : "0x81377dfeb244bd31d1c06db5ca52e8c89c72f1b452ff8249584b1b70621e19d6",
-                    "nonce" : "0x51202455f70f2062",
+                    "hash" : "0x0da8532eab2a6477c8ef8edb2602e05aba391fa4b2d080689a19781f2e92aae8",
+                    "mixHash" : "0x95e88cac33d7228af58dcf3bfd1d6eb7a42f31a36ec6e8a3feb642dfbc13f509",
+                    "nonce" : "0x0f6ffce55782ec16",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a081377dfeb244bd31d1c06db5ca52e8c89c72f1b452ff8249584b1b70621e19d68851202455f70f2062f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a095e88cac33d7228af58dcf3bfd1d6eb7a42f31a36ec6e8a3feb642dfbc13f509880f6ffce55782ec16f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc74d18a869085cf84f64b2d6624ce5063944666f9ea47f781c3a95b0a56044f",
+        "lastblockhash" : "0x0da8532eab2a6477c8ef8edb2602e05aba391fa4b2d080689a19781f2e92aae8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d33g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x074f2e4085699ca29442cf70c9446ef455f3dcbfafe415a1ba6d068f1388edd0",
-                    "mixHash" : "0xc2dd76d85b215399d95d59e0f6281a396edd6412292d6dbf389866f30b105fd8",
-                    "nonce" : "0xc9b7c8f97c59fa02",
+                    "hash" : "0x0d00220bf8ddec740c3613c5b7c9a2df7c51252914fba931d4ec704dd7d3d74e",
+                    "mixHash" : "0xe4dbd4e8cbbd1417d149ad2f48746f8d6411338281548bcf02bd822ca6e821f7",
+                    "nonce" : "0xac28684f7f75617c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c2dd76d85b215399d95d59e0f6281a396edd6412292d6dbf389866f30b105fd888c9b7c8f97c59fa02f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e4dbd4e8cbbd1417d149ad2f48746f8d6411338281548bcf02bd822ca6e821f788ac28684f7f75617cf85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x074f2e4085699ca29442cf70c9446ef455f3dcbfafe415a1ba6d068f1388edd0",
+        "lastblockhash" : "0x0d00220bf8ddec740c3613c5b7c9a2df7c51252914fba931d4ec704dd7d3d74e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d33g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x73363461ef6fbb14eab3c6fbd9505b197d29e021dd13f419ad547b64f3b5681e",
-                    "mixHash" : "0x7985524181252222adbf810a10556e73ad6704beeb4f7d74f09f1e6a59b1ee83",
-                    "nonce" : "0xde0b17a6da3c9d32",
+                    "hash" : "0xee193c1a0be0746d43057801b1834951c62a83318e5156f97ff381bbbe8dd65d",
+                    "mixHash" : "0xe6098fa239e1e5563d2a3574ac2da85be4503f1313933d29684a1d95d9f86c0a",
+                    "nonce" : "0xa8886f7d4a2fb34e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07985524181252222adbf810a10556e73ad6704beeb4f7d74f09f1e6a59b1ee8388de0b17a6da3c9d32f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e6098fa239e1e5563d2a3574ac2da85be4503f1313933d29684a1d95d9f86c0a88a8886f7d4a2fb34ef85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73363461ef6fbb14eab3c6fbd9505b197d29e021dd13f419ad547b64f3b5681e",
+        "lastblockhash" : "0xee193c1a0be0746d43057801b1834951c62a83318e5156f97ff381bbbe8dd65d",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d33g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4563cc028df80c5f7798af5506bc93e6daac75940eab19155e26cce59ca61053",
-                    "mixHash" : "0x9615e2364fa38c561834966efc8e67f3a318e10db05154e1d197a3e9424babad",
-                    "nonce" : "0x867091da4e14585f",
+                    "hash" : "0x7f2fa3e23648f37b955f75e4875a07db47006e67da3215e0de686cd105dd94da",
+                    "mixHash" : "0xa883e3be69157276c2278c678fa877cee064183ffe8833b00c728d63544cb5d0",
+                    "nonce" : "0x6b21f8dcafe01729",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09615e2364fa38c561834966efc8e67f3a318e10db05154e1d197a3e9424babad88867091da4e14585ff85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a883e3be69157276c2278c678fa877cee064183ffe8833b00c728d63544cb5d0886b21f8dcafe01729f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4563cc028df80c5f7798af5506bc93e6daac75940eab19155e26cce59ca61053",
+        "lastblockhash" : "0x7f2fa3e23648f37b955f75e4875a07db47006e67da3215e0de686cd105dd94da",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d33g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x10d55893f1bc8d585196691999111d330714099b1ebc9c5c88fe5f9a21bde156",
-                    "mixHash" : "0x03aa71bacf836ffab5c68c9a776b06159f82d4baa9c91cf1b0b1276bd358a9de",
-                    "nonce" : "0x8b55aedaa25aa8c0",
+                    "hash" : "0x0e2f8a5ed46cc9d083096a39342e0d930ffe3cbfaff27a4e966681e4ec6f2a7d",
+                    "mixHash" : "0xbc6b40a45eaecc4d37bd8682fed191c12431fe8ca635c1368d5d00f09b388af6",
+                    "nonce" : "0x41093fa8b34e0bb2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a003aa71bacf836ffab5c68c9a776b06159f82d4baa9c91cf1b0b1276bd358a9de888b55aedaa25aa8c0f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bc6b40a45eaecc4d37bd8682fed191c12431fe8ca635c1368d5d00f09b388af68841093fa8b34e0bb2f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10d55893f1bc8d585196691999111d330714099b1ebc9c5c88fe5f9a21bde156",
+        "lastblockhash" : "0x0e2f8a5ed46cc9d083096a39342e0d930ffe3cbfaff27a4e966681e4ec6f2a7d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d33g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d33g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x098dfc1c3e50b23c38eaac072692e615b8dc995df1e8b983ce1c03ba19928d0a",
-                    "mixHash" : "0xa252d6ebf06b054a83acf86f7cc6e7b7e6a0a0fdda09ab750ed7e30983a5c558",
-                    "nonce" : "0x63fb77fc6af20ad0",
+                    "hash" : "0xd85d7bb98c3bd2e4e2ce67fa7a2a2671dbbb25a4c571bc65fd460cfb67b51a4e",
+                    "mixHash" : "0x38f79fe8ed5a4750f18790c7c7851b0ceac5e1c8bb446e27a327073624d8e81b",
+                    "nonce" : "0x4acd5300238aeaa0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x28f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a252d6ebf06b054a83acf86f7cc6e7b7e6a0a0fdda09ab750ed7e30983a5c5588863fb77fc6af20ad0f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028f70b6b1e002143d8e0dd9dfcec7e4d95e16241a456f6524be4d9be307e9b29a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a038f79fe8ed5a4750f18790c7c7851b0ceac5e1c8bb446e27a327073624d8e81b884acd5300238aeaa0f85ff85d800183061a8080830186a08e60016001600160014d60006000f31ca0af3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7a024343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014d60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x098dfc1c3e50b23c38eaac072692e615b8dc995df1e8b983ce1c03ba19928d0a",
+        "lastblockhash" : "0xd85d7bb98c3bd2e4e2ce67fa7a2a2671dbbb25a4c571bc65fd460cfb67b51a4e",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0.json
index 4bcbb0358..953cd5313 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d34g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x65c93a2745c802bb72332d9567791faaaf183ceb574151d3a8a3ebd58e79c6aa",
-                    "mixHash" : "0x064383b04352e0df38b8b8be6d6026386c0c34156b0b9f9a15a0720bd28a5a81",
-                    "nonce" : "0x5530f9fad29df8a5",
+                    "hash" : "0x59572af2727ff14ac0172bf9ec2a75986772cb746cb3fd7c9fdfa0dcd04d5e20",
+                    "mixHash" : "0x5bdda6a1acda15a2bcaf39c4eaa0d37a3ecf697c8c30a86dbf66e62776988170",
+                    "nonce" : "0xcad164e9a7ef3aa5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0064383b04352e0df38b8b8be6d6026386c0c34156b0b9f9a15a0720bd28a5a81885530f9fad29df8a5f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05bdda6a1acda15a2bcaf39c4eaa0d37a3ecf697c8c30a86dbf66e6277698817088cad164e9a7ef3aa5f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65c93a2745c802bb72332d9567791faaaf183ceb574151d3a8a3ebd58e79c6aa",
+        "lastblockhash" : "0x59572af2727ff14ac0172bf9ec2a75986772cb746cb3fd7c9fdfa0dcd04d5e20",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d34g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4bec9aa800c6cd0ad86dcce0f09d7c0e34f0cbfe7c9604cde77297468dfc0132",
-                    "mixHash" : "0x4b1f750dd27f8f4ee6859680d736fab076f8bd1d1afb0634f0fe020c08cb4796",
-                    "nonce" : "0x2f554cae57987146",
+                    "hash" : "0xa29e68873a4c8c6cce437904ce57dd281abae45fbf9eedae7944d9dfdfcf4f72",
+                    "mixHash" : "0x1fe7023a61c12e7d8722b86f80fe98cce31901474a5ef4f5ff68dd19870012c2",
+                    "nonce" : "0xbb238b2aaac549d2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04b1f750dd27f8f4ee6859680d736fab076f8bd1d1afb0634f0fe020c08cb4796882f554cae57987146f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01fe7023a61c12e7d8722b86f80fe98cce31901474a5ef4f5ff68dd19870012c288bb238b2aaac549d2f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4bec9aa800c6cd0ad86dcce0f09d7c0e34f0cbfe7c9604cde77297468dfc0132",
+        "lastblockhash" : "0xa29e68873a4c8c6cce437904ce57dd281abae45fbf9eedae7944d9dfdfcf4f72",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d34g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc4f8b546282c291645e2ad140c3ebc7b67d7c32aea2de8f44e0b1b4062ecfad8",
-                    "mixHash" : "0x549133ff749e4d238da3c91add9317f2e4ba895fa082075d0f75b3653928c079",
-                    "nonce" : "0x389722c2c21045f2",
+                    "hash" : "0xc0914224861927879dcc9504abb21e7433d9deb0bde0221c77831c19a9ea2773",
+                    "mixHash" : "0xcffac0f093cfa5b925d4f1ddf04a59a920c6ded99e30477abb5c44089227d0d6",
+                    "nonce" : "0x9fedbd9c9c88c17e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0549133ff749e4d238da3c91add9317f2e4ba895fa082075d0f75b3653928c07988389722c2c21045f2f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cffac0f093cfa5b925d4f1ddf04a59a920c6ded99e30477abb5c44089227d0d6889fedbd9c9c88c17ef85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc4f8b546282c291645e2ad140c3ebc7b67d7c32aea2de8f44e0b1b4062ecfad8",
+        "lastblockhash" : "0xc0914224861927879dcc9504abb21e7433d9deb0bde0221c77831c19a9ea2773",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d34g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa86d308ca3dc5c349c3f4bf2bcf3e690b0d3f5e94e6ae63398677ede02677a25",
-                    "mixHash" : "0x5dccca15d074f615a7ae24621248a77b2a5f994eeaea7c5a4b97ba5a4fe04cb4",
-                    "nonce" : "0x878ac7106c9d1638",
+                    "hash" : "0x901acb5e6b6220f69ea0fad5fdee448c212fd0837906c311cc926f5f7201a76d",
+                    "mixHash" : "0x64c3a23e3c2e2bd5a4f19e734b5440d10ae4ac2dfb280db496d24c3799c3c360",
+                    "nonce" : "0xa95c05fe8d7979ae",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05dccca15d074f615a7ae24621248a77b2a5f994eeaea7c5a4b97ba5a4fe04cb488878ac7106c9d1638f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a064c3a23e3c2e2bd5a4f19e734b5440d10ae4ac2dfb280db496d24c3799c3c36088a95c05fe8d7979aef85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa86d308ca3dc5c349c3f4bf2bcf3e690b0d3f5e94e6ae63398677ede02677a25",
+        "lastblockhash" : "0x901acb5e6b6220f69ea0fad5fdee448c212fd0837906c311cc926f5f7201a76d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d34g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8f263b22e28ca671939bf9cf2490f534d1ddcb16a3bc5f7dbc93e26524f266e0",
-                    "mixHash" : "0xa3757d4b6ff0e253abb2dcc1338e47498638627b1db16b388fd51cc6cf9c9222",
-                    "nonce" : "0xe5ebe8438a15334f",
+                    "hash" : "0x00fb07c13a92a44648f30895ccf222d05a46aae2d292e3f7c1bb742c33311b7d",
+                    "mixHash" : "0x45e5cadc391113dc02d2df83d0bccdb718419f103097e8484463efadae777375",
+                    "nonce" : "0x9292298f827e4042",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a3757d4b6ff0e253abb2dcc1338e47498638627b1db16b388fd51cc6cf9c922288e5ebe8438a15334ff85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a045e5cadc391113dc02d2df83d0bccdb718419f103097e8484463efadae777375889292298f827e4042f85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f263b22e28ca671939bf9cf2490f534d1ddcb16a3bc5f7dbc93e26524f266e0",
+        "lastblockhash" : "0x00fb07c13a92a44648f30895ccf222d05a46aae2d292e3f7c1bb742c33311b7d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d34g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d34g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b1aff6812c74d08a46d0a24684380813344233cbe6658e38e703e0af9cf9756",
-                    "mixHash" : "0xe06fffa62c69617ef4cde6ce2e9edcf818394db0474a281c4b8742c31270cbc2",
-                    "nonce" : "0xdb8d73ca7a84d44c",
+                    "hash" : "0x3a1c8c90f3d360ba767d8f6fc1460bc35ce2f936d6a2aa117d3d19c7a9852035",
+                    "mixHash" : "0x58c7e15a68fa9747986be733442b24e2540a33c00d5132c524a5d2a131347b7e",
+                    "nonce" : "0xb8fce8c581db106e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e06fffa62c69617ef4cde6ce2e9edcf818394db0474a281c4b8742c31270cbc288db8d73ca7a84d44cf85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ded6688f7dea980f66042383270ca7c553fbd2864859bf55935e94bee8955c4fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a058c7e15a68fa9747986be733442b24e2540a33c00d5132c524a5d2a131347b7e88b8fce8c581db106ef85ff85d800183061a8080830186a08e60016001600160014e60006000f31ba0816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08a07b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713bc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014e60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b1aff6812c74d08a46d0a24684380813344233cbe6658e38e703e0af9cf9756",
+        "lastblockhash" : "0x3a1c8c90f3d360ba767d8f6fc1460bc35ce2f936d6a2aa117d3d19c7a9852035",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0.json
index 9f1dbdaaa..fa54e19c8 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d35g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x26958cca0de852fa9636a9e9326ee267528d03ab04422160577f9c3febb4340c",
-                    "mixHash" : "0xdb089e7a7ed64c132e0fd9cf44df06faca26750a914f0fd8ac7e3b42caa4ca01",
-                    "nonce" : "0xb4c9db45c3873a82",
+                    "hash" : "0x44057103ffeb66e22a36f5da8ff7e94353bb841aa505b4aec375b2edb2a2834c",
+                    "mixHash" : "0x36fd2138f58be0abc59b1ad3df8483cca0536300b905a5a18c16efbfa0dd3b64",
+                    "nonce" : "0x09e9694ae000c331",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0db089e7a7ed64c132e0fd9cf44df06faca26750a914f0fd8ac7e3b42caa4ca0188b4c9db45c3873a82f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a036fd2138f58be0abc59b1ad3df8483cca0536300b905a5a18c16efbfa0dd3b648809e9694ae000c331f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26958cca0de852fa9636a9e9326ee267528d03ab04422160577f9c3febb4340c",
+        "lastblockhash" : "0x44057103ffeb66e22a36f5da8ff7e94353bb841aa505b4aec375b2edb2a2834c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d35g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfb91cc9729566d1e6e18aeef7ba98c059078a050387faea877286c27275d6bab",
-                    "mixHash" : "0xf6aae58311beb6ea1a2bbbca00cede269790c756ba6138198fe1e4b8a94e170f",
-                    "nonce" : "0x1c33bbb4bb1cd3f2",
+                    "hash" : "0xbe1bcfe2755718d438ffe1fd82678d305e533ed1b53cba0d975b60a583b3c3f4",
+                    "mixHash" : "0xdbad5d1780317aa1583924d73f9b201c547bbb88bf3a01128d58a1d41eb7f770",
+                    "nonce" : "0x962a77ea74dcc8f0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f6aae58311beb6ea1a2bbbca00cede269790c756ba6138198fe1e4b8a94e170f881c33bbb4bb1cd3f2f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dbad5d1780317aa1583924d73f9b201c547bbb88bf3a01128d58a1d41eb7f77088962a77ea74dcc8f0f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb91cc9729566d1e6e18aeef7ba98c059078a050387faea877286c27275d6bab",
+        "lastblockhash" : "0xbe1bcfe2755718d438ffe1fd82678d305e533ed1b53cba0d975b60a583b3c3f4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d35g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x53175a2c9500387384b79a6bb9d819c08b934b41603b19a3dcb3db33fee811b7",
-                    "mixHash" : "0x0e25a3e34c9b66eb3d31073a0520e3f62d2ccc323779cc89a8c9df7547a47813",
-                    "nonce" : "0x0f2d060b79e5ffa1",
+                    "hash" : "0xe248cef9cd140cb64965f9affac6c8ab998b8dc837b2af15e7d6ea123bc6e6ee",
+                    "mixHash" : "0xdae2d1ea4924276138bf5ed93709186ba20b9fcacd2e3af8a9708f502b021139",
+                    "nonce" : "0xe2c6a409d8c1334f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00e25a3e34c9b66eb3d31073a0520e3f62d2ccc323779cc89a8c9df7547a47813880f2d060b79e5ffa1f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dae2d1ea4924276138bf5ed93709186ba20b9fcacd2e3af8a9708f502b02113988e2c6a409d8c1334ff85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53175a2c9500387384b79a6bb9d819c08b934b41603b19a3dcb3db33fee811b7",
+        "lastblockhash" : "0xe248cef9cd140cb64965f9affac6c8ab998b8dc837b2af15e7d6ea123bc6e6ee",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d35g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x87b3d944af0198ba1530f73871c98c310f7a40584f9dccece2e4446a007d3099",
-                    "mixHash" : "0xbf4c4f4ce70951c50696d2a38537dca716535dfdf83ed408c5a3fb5116410d04",
-                    "nonce" : "0x78d5cc298667ebd1",
+                    "hash" : "0x104a8a4ed5b2663b1a2374ee8eb8b439bed6236a68a2694b31423bfa1eb94ed3",
+                    "mixHash" : "0x8973972b8af243a42a159497774ebef9c1b525ca3965ba21f98bd710ed4cf981",
+                    "nonce" : "0x9660e18ae8a8787e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bf4c4f4ce70951c50696d2a38537dca716535dfdf83ed408c5a3fb5116410d048878d5cc298667ebd1f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08973972b8af243a42a159497774ebef9c1b525ca3965ba21f98bd710ed4cf981889660e18ae8a8787ef85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87b3d944af0198ba1530f73871c98c310f7a40584f9dccece2e4446a007d3099",
+        "lastblockhash" : "0x104a8a4ed5b2663b1a2374ee8eb8b439bed6236a68a2694b31423bfa1eb94ed3",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d35g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb0a9bcc794c38a16e7a1e0e07c7d4d89497e341872e724e455a9257186b70208",
-                    "mixHash" : "0x356051f8aff88f9db662d04277a216b6583aa1c92abf59a20b9ebf561176a28f",
-                    "nonce" : "0xd6bb86f2e8a9191e",
+                    "hash" : "0x3cff8164f20113b567e5a8f47626a24c9d315a117ba3ae054ce074c0808b489c",
+                    "mixHash" : "0xa91e98294141fda1a79099d6a5e760220406c32c103863bffa2757891b91fc05",
+                    "nonce" : "0xd2cef650857fc2a8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0356051f8aff88f9db662d04277a216b6583aa1c92abf59a20b9ebf561176a28f88d6bb86f2e8a9191ef85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a91e98294141fda1a79099d6a5e760220406c32c103863bffa2757891b91fc0588d2cef650857fc2a8f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0a9bcc794c38a16e7a1e0e07c7d4d89497e341872e724e455a9257186b70208",
+        "lastblockhash" : "0x3cff8164f20113b567e5a8f47626a24c9d315a117ba3ae054ce074c0808b489c",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d35g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d35g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5342dd8d5daa247214ea39be4c046cb5ed60ae5d4ea6989308c9d4c701a4c840",
-                    "mixHash" : "0x0336b593d5ac18f046832a7fde480e9d673d203efde128a022d6bf1bc4a0b991",
-                    "nonce" : "0x935fea77f2e4c6b0",
+                    "hash" : "0x4e69bd5ad0b9550316c8fc3c12b331244a14ba9f43693043c20cecf89e062cea",
+                    "mixHash" : "0x7f1fbe78bef73c400323a24455f946b020611d5f1ac5c7f8298298f1b8c25983",
+                    "nonce" : "0xe82e8df56830b383",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x1a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00336b593d5ac18f046832a7fde480e9d673d203efde128a022d6bf1bc4a0b99188935fea77f2e4c6b0f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01a1a638d4664f95c2b30f41d1d7de5a07d91a45891cf0b54f2a9afbdece90910a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f1fbe78bef73c400323a24455f946b020611d5f1ac5c7f8298298f1b8c2598388e82e8df56830b383f85ff85d800183061a8080830186a08e60016001600160014f60006000f31ba0d00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0a056aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160014f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5342dd8d5daa247214ea39be4c046cb5ed60ae5d4ea6989308c9d4c701a4c840",
+        "lastblockhash" : "0x4e69bd5ad0b9550316c8fc3c12b331244a14ba9f43693043c20cecf89e062cea",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0.json
index ae0690893..07c2ae6a9 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d36g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x680a3e2793cf937e346b77e45df8b2d540688af6ff90ef45acf053c3c7543a68",
-                    "mixHash" : "0xd96674bd2d9c55ab8c6306fb5c44a7fb42484befe6c9da2953754fcd518b800f",
-                    "nonce" : "0x2ef3e199a31b9967",
+                    "hash" : "0xddc1d21fa7211d4a693b8dd18cd29bad3dadc8ca1952ea5bb9b5c98ffe3077fa",
+                    "mixHash" : "0xf7fe0d5fb1917d5a00a60141fdafb8584355ee690d33e8a7c7a8ae7b18294007",
+                    "nonce" : "0x903e6597e8290496",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d96674bd2d9c55ab8c6306fb5c44a7fb42484befe6c9da2953754fcd518b800f882ef3e199a31b9967f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f7fe0d5fb1917d5a00a60141fdafb8584355ee690d33e8a7c7a8ae7b1829400788903e6597e8290496f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x680a3e2793cf937e346b77e45df8b2d540688af6ff90ef45acf053c3c7543a68",
+        "lastblockhash" : "0xddc1d21fa7211d4a693b8dd18cd29bad3dadc8ca1952ea5bb9b5c98ffe3077fa",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d36g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xee49768368c2189e02270fbe1807b83d96f2714c8cbc7f150e1aa9051c46fd19",
-                    "mixHash" : "0xdea3472719937dd8f792f2ad7af3838d10031ba7526504d265a40503925e3704",
-                    "nonce" : "0x993a1d5c67f9609e",
+                    "hash" : "0x7e170fa2766faffabb7fcba55549d98ad78e8544f3f9a0c27c0177a8961d294b",
+                    "mixHash" : "0xdbca6df6f94d5c0d1678594844a51a65e91dd1444a9427497d30800b0eaff643",
+                    "nonce" : "0x6d2205af4c67ee36",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dea3472719937dd8f792f2ad7af3838d10031ba7526504d265a40503925e370488993a1d5c67f9609ef85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dbca6df6f94d5c0d1678594844a51a65e91dd1444a9427497d30800b0eaff643886d2205af4c67ee36f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee49768368c2189e02270fbe1807b83d96f2714c8cbc7f150e1aa9051c46fd19",
+        "lastblockhash" : "0x7e170fa2766faffabb7fcba55549d98ad78e8544f3f9a0c27c0177a8961d294b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d36g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xef641c65d3041f0a0e0ac5b059365f718ba215c72a26525acf2bb7dba6b6e561",
-                    "mixHash" : "0xb58c022821aaff4f006c74a5a8700b7db3324cdd3695a8f4dfd05f5356a1114c",
-                    "nonce" : "0x13475ea5104f6c4a",
+                    "hash" : "0xae1f2376dd159a1b896654db2fc2341ac3093e1db881f22d475f9050b71db09e",
+                    "mixHash" : "0xbe635f2299d2319e608bb9f83b31430c2d5a9a9f6e1621fd031ad67f3bb717df",
+                    "nonce" : "0x7f6d2747d1fe5cb9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b58c022821aaff4f006c74a5a8700b7db3324cdd3695a8f4dfd05f5356a1114c8813475ea5104f6c4af85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0be635f2299d2319e608bb9f83b31430c2d5a9a9f6e1621fd031ad67f3bb717df887f6d2747d1fe5cb9f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef641c65d3041f0a0e0ac5b059365f718ba215c72a26525acf2bb7dba6b6e561",
+        "lastblockhash" : "0xae1f2376dd159a1b896654db2fc2341ac3093e1db881f22d475f9050b71db09e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d36g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfd43763cbde948ce3f57938fa2207921905f5c06173216190ef9a426ff92c515",
-                    "mixHash" : "0xc147bcfb3c00d97fbd101daa2e036dd44a97cb14e3ec30a47fd5f89c94e2e414",
-                    "nonce" : "0x492d530fbddc6ec6",
+                    "hash" : "0x628450f95fc8ee29a0bc8d55b0f10ad43f7119c6e0d4ce84a03b8bb8bae22e57",
+                    "mixHash" : "0x3b03e4cb7f4df8828da3f647d35087f8eb8c7861fbad1e3cb101e15cb041f36c",
+                    "nonce" : "0xeede96a1f2fe02d1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c147bcfb3c00d97fbd101daa2e036dd44a97cb14e3ec30a47fd5f89c94e2e41488492d530fbddc6ec6f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b03e4cb7f4df8828da3f647d35087f8eb8c7861fbad1e3cb101e15cb041f36c88eede96a1f2fe02d1f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd43763cbde948ce3f57938fa2207921905f5c06173216190ef9a426ff92c515",
+        "lastblockhash" : "0x628450f95fc8ee29a0bc8d55b0f10ad43f7119c6e0d4ce84a03b8bb8bae22e57",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d36g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x65a9e618502a4b2d327f553131bd47c36d95804d36d70832512594512eeb35d8",
-                    "mixHash" : "0xbc860042887ee3da66287a978d1eaa8c57ff9ffcfc275e27b301a98a81eb1a9f",
-                    "nonce" : "0x0a50869ce4b4862f",
+                    "hash" : "0xe21ac723fa0ca3964347212245b088964f5691c401fb82cf1b895150861d244d",
+                    "mixHash" : "0x6ec953288d7e3c902f182a7b74c6b274baf2a1a075bd2456c8f295285a4d7cc9",
+                    "nonce" : "0x7b181d39135f4acc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bc860042887ee3da66287a978d1eaa8c57ff9ffcfc275e27b301a98a81eb1a9f880a50869ce4b4862ff85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ec953288d7e3c902f182a7b74c6b274baf2a1a075bd2456c8f295285a4d7cc9887b181d39135f4accf85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65a9e618502a4b2d327f553131bd47c36d95804d36d70832512594512eeb35d8",
+        "lastblockhash" : "0xe21ac723fa0ca3964347212245b088964f5691c401fb82cf1b895150861d244d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d36g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d36g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x22c2ead0f41aceae487f318572340b68728440413b8bc3762f5273f453a6f221",
-                    "mixHash" : "0x20d280499a5a6341f596c23c0e45e60410a48608a46de5e2e2565f685e82d898",
-                    "nonce" : "0x4448b003ed3ad74f",
+                    "hash" : "0xe81c2f90f1fa1614a3e42979efbca175e39c5dade32e058fd579586a7fcea844",
+                    "mixHash" : "0xf79974d38390cdfd3f51c52934db9c9d356235890c2197b5f51c3d9946e8ad73",
+                    "nonce" : "0x3b751e2d41d0f119",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a020d280499a5a6341f596c23c0e45e60410a48608a46de5e2e2565f685e82d898884448b003ed3ad74ff85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0742b8d0a831f43531a0ca4db833f33cf86157508539b9a5fe0982f649622d56da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f79974d38390cdfd3f51c52934db9c9d356235890c2197b5f51c3d9946e8ad73883b751e2d41d0f119f85ff85d800183061a8080830186a08e60016001600160015c60006000f31ca031a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294a04e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462ec0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015c60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22c2ead0f41aceae487f318572340b68728440413b8bc3762f5273f453a6f221",
+        "lastblockhash" : "0xe81c2f90f1fa1614a3e42979efbca175e39c5dade32e058fd579586a7fcea844",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0.json
index 955e8b7ea..1e1519b48 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d37g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc5d417ff1d9fba05c6659b09516d58333fa87630e885b447ad1bc4fcb48391a3",
-                    "mixHash" : "0x473b86980455c8ffd5eceea263d6deb9a0aa0a31126a97ee3b3ea4b586d28ebf",
-                    "nonce" : "0xcb350956328dc605",
+                    "hash" : "0x9e2e5e90ed732284625c8483988f11ddfb8c78e89210470a2899b4f4b614be86",
+                    "mixHash" : "0x5dc2fb292dff4ba5ee1cf5626018d6b7824974f0072cde6c3d071379c2a349f6",
+                    "nonce" : "0xf07308859ce8c09e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0473b86980455c8ffd5eceea263d6deb9a0aa0a31126a97ee3b3ea4b586d28ebf88cb350956328dc605f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05dc2fb292dff4ba5ee1cf5626018d6b7824974f0072cde6c3d071379c2a349f688f07308859ce8c09ef85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5d417ff1d9fba05c6659b09516d58333fa87630e885b447ad1bc4fcb48391a3",
+        "lastblockhash" : "0x9e2e5e90ed732284625c8483988f11ddfb8c78e89210470a2899b4f4b614be86",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d37g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x963b2bc91d579e1839137d0288dc42974c630b2f91dff88620d9371e73588b09",
-                    "mixHash" : "0x57a9a8b996cd3e0563f69a42c3b20965844ca1734f6e52207860950a392a18d7",
-                    "nonce" : "0x54730fff3e16d282",
+                    "hash" : "0x49a6a48067139b34be0282a7767baba045f8e90a6ae21c56195f68c6df5a6270",
+                    "mixHash" : "0xe2093291e26da4b01b7fdfa76888fea12f52c5d4cf16d4a9ebb5c98b167c0c1b",
+                    "nonce" : "0xc1a255ddba99f88d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057a9a8b996cd3e0563f69a42c3b20965844ca1734f6e52207860950a392a18d78854730fff3e16d282f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e2093291e26da4b01b7fdfa76888fea12f52c5d4cf16d4a9ebb5c98b167c0c1b88c1a255ddba99f88df85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x963b2bc91d579e1839137d0288dc42974c630b2f91dff88620d9371e73588b09",
+        "lastblockhash" : "0x49a6a48067139b34be0282a7767baba045f8e90a6ae21c56195f68c6df5a6270",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d37g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe60982067a761b3f5f8f15bf63047186b9e7d6c85b7c454305402c241ba990a1",
-                    "mixHash" : "0x3b63442193e0c3c3b195ae60e35b333b6f25e022b8ce08f896c53b4944ba22df",
-                    "nonce" : "0x486bc1d33de3ad86",
+                    "hash" : "0x1651030929ad444b516f05208a065bbf313870da2bdc4dec47c3313de1041f76",
+                    "mixHash" : "0x028f65d2c8ac4f896eb35f730dab4981e359e5f8195c4cf80bd8e55824a98d3f",
+                    "nonce" : "0x69c0900355bdab33",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b63442193e0c3c3b195ae60e35b333b6f25e022b8ce08f896c53b4944ba22df88486bc1d33de3ad86f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0028f65d2c8ac4f896eb35f730dab4981e359e5f8195c4cf80bd8e55824a98d3f8869c0900355bdab33f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe60982067a761b3f5f8f15bf63047186b9e7d6c85b7c454305402c241ba990a1",
+        "lastblockhash" : "0x1651030929ad444b516f05208a065bbf313870da2bdc4dec47c3313de1041f76",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d37g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8436a4b52ec4bde18b42a319972d6bd54b7a66eb7ee247a2ab30f567c6b1032b",
-                    "mixHash" : "0xc2a3d48c982dbd397bfab7d915587b28344fc5b46bd20c7a37f27b36ee868ced",
-                    "nonce" : "0xea348ba40202bee3",
+                    "hash" : "0x6001056eb72b2b6b87020bd2fb7601d0f412157d3f1cce0eaee24c0e7d22cf76",
+                    "mixHash" : "0x52e96a3361647b023ac2168acbef8ae088d8c0c1c518336298a4ada47e6889cd",
+                    "nonce" : "0x01512c8156de7dbd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c2a3d48c982dbd397bfab7d915587b28344fc5b46bd20c7a37f27b36ee868ced88ea348ba40202bee3f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052e96a3361647b023ac2168acbef8ae088d8c0c1c518336298a4ada47e6889cd8801512c8156de7dbdf85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8436a4b52ec4bde18b42a319972d6bd54b7a66eb7ee247a2ab30f567c6b1032b",
+        "lastblockhash" : "0x6001056eb72b2b6b87020bd2fb7601d0f412157d3f1cce0eaee24c0e7d22cf76",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d37g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xde847b73e916232be1b9c60a9b559346f55fcf22d3e64da76d7a1d0d512ab41e",
-                    "mixHash" : "0x0cff1dfe9eba8454103aff8fdb13be5c56c5b68b656a7799ebd015eeedae8fe6",
-                    "nonce" : "0x67ae0fa54ba9734f",
+                    "hash" : "0x2481104360a0fa781e7a78513814400dbec28e1c2ad5797c10f12717bd2a8147",
+                    "mixHash" : "0xe86bfd5b1124b5d890e883b4e0db42ec4ff04b5e0a256c84cee2ccdcc37de31c",
+                    "nonce" : "0x47128a69b070a1b6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00cff1dfe9eba8454103aff8fdb13be5c56c5b68b656a7799ebd015eeedae8fe68867ae0fa54ba9734ff85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e86bfd5b1124b5d890e883b4e0db42ec4ff04b5e0a256c84cee2ccdcc37de31c8847128a69b070a1b6f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde847b73e916232be1b9c60a9b559346f55fcf22d3e64da76d7a1d0d512ab41e",
+        "lastblockhash" : "0x2481104360a0fa781e7a78513814400dbec28e1c2ad5797c10f12717bd2a8147",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d37g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d37g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc6b4014ea445ea648efb8f5563df9a5cde0eb5d00e24584696cdd29c3152f47f",
-                    "mixHash" : "0x377a45aeb997e78a44f0e10bb1d7e5ecc362d977e75be9c9a3985567cfa6dd0c",
-                    "nonce" : "0x25010a7bb617da8d",
+                    "hash" : "0x96bb3e222215aa365e87413a12d5c30346df853f153c2432c247b082825f98cf",
+                    "mixHash" : "0x34956288ceb4d1b15653f58ea9d64d39e7d690c215c26cc315c9b0020cbc64c8",
+                    "nonce" : "0xfaf4bcb5c32dafc5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19ab",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0377a45aeb997e78a44f0e10bb1d7e5ecc362d977e75be9c9a3985567cfa6dd0c8825010a7bb617da8df85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0572b5aaf37093eaed13b0ed0ef3520b3214f4a8eb59a4e85ad4b6829d83e19aba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a034956288ceb4d1b15653f58ea9d64d39e7d690c215c26cc315c9b0020cbc64c888faf4bcb5c32dafc5f85ff85d800183061a8080830186a08e60016001600160015d60006000f31ca07f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141ba06fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fcc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015d60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6b4014ea445ea648efb8f5563df9a5cde0eb5d00e24584696cdd29c3152f47f",
+        "lastblockhash" : "0x96bb3e222215aa365e87413a12d5c30346df853f153c2432c247b082825f98cf",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0.json
index 92d407fd4..6c3f28bba 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d38g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc77f4c72d3ef948134729f1db3980a12be9f649fa58836c67048646b39db5eb8",
-                    "mixHash" : "0x678003ec002540e8532e5a0e89cea3ad31d59586cd593fc8611ea01fd437fa2d",
-                    "nonce" : "0x234f8e54788893f7",
+                    "hash" : "0x604eb2f2131d78c5c24bd9e2e50a25040e046713c9e9627d6757deb57fb2591e",
+                    "mixHash" : "0xb9f7e6a92b495ade4f856280189332c4a055e1083e124ccc06cfa46f8a39d844",
+                    "nonce" : "0xd92a9551124f6113",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0678003ec002540e8532e5a0e89cea3ad31d59586cd593fc8611ea01fd437fa2d88234f8e54788893f7f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b9f7e6a92b495ade4f856280189332c4a055e1083e124ccc06cfa46f8a39d84488d92a9551124f6113f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc77f4c72d3ef948134729f1db3980a12be9f649fa58836c67048646b39db5eb8",
+        "lastblockhash" : "0x604eb2f2131d78c5c24bd9e2e50a25040e046713c9e9627d6757deb57fb2591e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d38g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x15e9ea8f9647e62696d56377c712306e03ba3e5e418f35a8e5104b373b62f3be",
-                    "mixHash" : "0x3ed398785b6d0e11e20e6133b17522891b1a349bf71fb955efc63bbb58a95630",
-                    "nonce" : "0xc0d111bd54e577df",
+                    "hash" : "0x04c21d750707e0662f32157f3fc2c030af224571e2ea005fa3c84f23586c82c3",
+                    "mixHash" : "0xf971f07776f24667e6952147aea721012fbbac1bc2c40ad5a6261ee4ea36edd8",
+                    "nonce" : "0x07326214070cd362",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ed398785b6d0e11e20e6133b17522891b1a349bf71fb955efc63bbb58a9563088c0d111bd54e577dff85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f971f07776f24667e6952147aea721012fbbac1bc2c40ad5a6261ee4ea36edd88807326214070cd362f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15e9ea8f9647e62696d56377c712306e03ba3e5e418f35a8e5104b373b62f3be",
+        "lastblockhash" : "0x04c21d750707e0662f32157f3fc2c030af224571e2ea005fa3c84f23586c82c3",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d38g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x29dcfaa7492b12d28e13dc47bdc3d599dc3503c5d0def150709963f4be6e80f0",
-                    "mixHash" : "0x71fe238fd0d97cc98deb38d1eb00a0284de3b072a5d058ebfe68431d5cc8a04b",
-                    "nonce" : "0x659268c90fad06eb",
+                    "hash" : "0x7fa8675ac0e8d16cededbdf342cca3ad9d1f34c08424dd241492fae9615f1865",
+                    "mixHash" : "0x837a8dcf4522be4554efa75580c500befbb590a85534fa7c600a4675d847965f",
+                    "nonce" : "0x6bdc345be0f8a72f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a071fe238fd0d97cc98deb38d1eb00a0284de3b072a5d058ebfe68431d5cc8a04b88659268c90fad06ebf85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0837a8dcf4522be4554efa75580c500befbb590a85534fa7c600a4675d847965f886bdc345be0f8a72ff85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29dcfaa7492b12d28e13dc47bdc3d599dc3503c5d0def150709963f4be6e80f0",
+        "lastblockhash" : "0x7fa8675ac0e8d16cededbdf342cca3ad9d1f34c08424dd241492fae9615f1865",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d38g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf6a42d0ed88cf47b57626cffce56c0d528cd9077bc2279c440b0ab8a568989f4",
-                    "mixHash" : "0x059777d19ba96b3b5570660c069283fa700b0e859a62e04154105f8dfb31b308",
-                    "nonce" : "0xc52eafc1367a7f66",
+                    "hash" : "0x40e9bc431021bb4adf73da4175a33f33b3ea20a51b2564a6daa28e7db75f56ec",
+                    "mixHash" : "0x0ab63f1a910b99f83f86938af03ff296683cfeba7fc7ceb012bc7b28d099b546",
+                    "nonce" : "0xaf7f0806581d33a7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0059777d19ba96b3b5570660c069283fa700b0e859a62e04154105f8dfb31b30888c52eafc1367a7f66f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00ab63f1a910b99f83f86938af03ff296683cfeba7fc7ceb012bc7b28d099b54688af7f0806581d33a7f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6a42d0ed88cf47b57626cffce56c0d528cd9077bc2279c440b0ab8a568989f4",
+        "lastblockhash" : "0x40e9bc431021bb4adf73da4175a33f33b3ea20a51b2564a6daa28e7db75f56ec",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d38g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xde03dcda27f3deaeef90f0407b78de5e3104059138029230d7c4dd6f385fd517",
-                    "mixHash" : "0x2eace993880b3a72c78062b9e0ee608987a60173343f591d866ed827a9d43ef0",
-                    "nonce" : "0x93be8277b54e2c04",
+                    "hash" : "0x800d5881c2a7be8a650fc357a2b76b346316b140f5d24c333a273842679c2169",
+                    "mixHash" : "0x054b06938314b41b114e0af7187acf3a421164e629dca2da56de5cd9649eb920",
+                    "nonce" : "0xbcf8ea410f835e28",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02eace993880b3a72c78062b9e0ee608987a60173343f591d866ed827a9d43ef08893be8277b54e2c04f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0054b06938314b41b114e0af7187acf3a421164e629dca2da56de5cd9649eb92088bcf8ea410f835e28f85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde03dcda27f3deaeef90f0407b78de5e3104059138029230d7c4dd6f385fd517",
+        "lastblockhash" : "0x800d5881c2a7be8a650fc357a2b76b346316b140f5d24c333a273842679c2169",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d38g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d38g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd22067abc03a8718a751f086bf84bbd7209bd2bed92744f8c85f6881501f485e",
-                    "mixHash" : "0xbb8b64c8c826cd0905bccf43dfde522bdd06df61e44b9ca659769667ef7512eb",
-                    "nonce" : "0x1cdda75e7dd3e5fd",
+                    "hash" : "0x5356fe27870f3ece50f08efc1d16a2436b362a62d76a2d8f889c2a61676bf622",
+                    "mixHash" : "0x7235942e28b5c266202fbf64f26cb12a93e339afbbc5a65fda0c80b410108991",
+                    "nonce" : "0x7ba767182af360bf",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xa094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb8b64c8c826cd0905bccf43dfde522bdd06df61e44b9ca659769667ef7512eb881cdda75e7dd3e5fdf85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a094779fe74945dc0f2dc2663eec63bb06a0d2444dc0cb4cfb19c2d5d2c0b7e6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07235942e28b5c266202fbf64f26cb12a93e339afbbc5a65fda0c80b410108991887ba767182af360bff85ff85d800183061a8080830186a08e60016001600160015e60006000f31ca08768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4da00bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015e60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd22067abc03a8718a751f086bf84bbd7209bd2bed92744f8c85f6881501f485e",
+        "lastblockhash" : "0x5356fe27870f3ece50f08efc1d16a2436b362a62d76a2d8f889c2a61676bf622",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0.json
index d834d15b8..ec1d33c2f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d39g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x26a78eda99f7ae6c3a76bfcc6757785dca72c8daca2d23b02fe11cc3b86ec8db",
-                    "mixHash" : "0x57432f57adf2397b514b8234e8bcf334461aa2d91077d62e02951c69a7da17d6",
-                    "nonce" : "0x8eca392ff2a85d2b",
+                    "hash" : "0xf36e3636c203078122b83cb940d3d1e7fb0da673d201a616bb5c53e9e1aa9188",
+                    "mixHash" : "0x403bbd90ad0ecd72f317c5a52c8ac87eada0121a271834a199dd57df0d591d63",
+                    "nonce" : "0x434f52f1fc74aaf4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057432f57adf2397b514b8234e8bcf334461aa2d91077d62e02951c69a7da17d6888eca392ff2a85d2bf85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0403bbd90ad0ecd72f317c5a52c8ac87eada0121a271834a199dd57df0d591d6388434f52f1fc74aaf4f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26a78eda99f7ae6c3a76bfcc6757785dca72c8daca2d23b02fe11cc3b86ec8db",
+        "lastblockhash" : "0xf36e3636c203078122b83cb940d3d1e7fb0da673d201a616bb5c53e9e1aa9188",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d39g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc37a7aa1ea277191a1d68428d549bf0ca3022c08d601d703e579dda4c8d180af",
-                    "mixHash" : "0xdec2a07c68db2cffe30d90941cf66efa8e85ea920fbe18c44d46b00728e48dc1",
-                    "nonce" : "0x28fb4610998f84a1",
+                    "hash" : "0x418cecae78a8a97053a148c5d97881ac81a7fd78a020771a63a0ff2e5d774fd1",
+                    "mixHash" : "0x1885ecc098b526f7ec62f9c90943e8051ce068850be6e62a933bb3eb335c2eb3",
+                    "nonce" : "0x089c478952321f1f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dec2a07c68db2cffe30d90941cf66efa8e85ea920fbe18c44d46b00728e48dc18828fb4610998f84a1f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01885ecc098b526f7ec62f9c90943e8051ce068850be6e62a933bb3eb335c2eb388089c478952321f1ff85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc37a7aa1ea277191a1d68428d549bf0ca3022c08d601d703e579dda4c8d180af",
+        "lastblockhash" : "0x418cecae78a8a97053a148c5d97881ac81a7fd78a020771a63a0ff2e5d774fd1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d39g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc66bf56400deedc60aa822ee82e0e6cd68f1692fa946b6e14ef4d1c8cd6570cd",
-                    "mixHash" : "0x3163b3da567c5066c98a746ed43d77ac31b69cb46e91d54d9e4099ff839e6793",
-                    "nonce" : "0x7afd7a19d2689981",
+                    "hash" : "0xf6d41655293e6d6a870c63829b70d0cb16096004267883ad0661f8c0289598a8",
+                    "mixHash" : "0x30366be7510c5ad57042e59412da8c56a2f40d8ad7b615aa6dfaf930bdeada8e",
+                    "nonce" : "0xb5cef4a0465e23c8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03163b3da567c5066c98a746ed43d77ac31b69cb46e91d54d9e4099ff839e6793887afd7a19d2689981f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a030366be7510c5ad57042e59412da8c56a2f40d8ad7b615aa6dfaf930bdeada8e88b5cef4a0465e23c8f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc66bf56400deedc60aa822ee82e0e6cd68f1692fa946b6e14ef4d1c8cd6570cd",
+        "lastblockhash" : "0xf6d41655293e6d6a870c63829b70d0cb16096004267883ad0661f8c0289598a8",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d39g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfe713e62de4bf119a9548dce80d20f2078537635afd84ca3bde7090f648ec3bf",
-                    "mixHash" : "0xd6625e74f9a3102a79b0d73dc429a6ee11545b5510b9e58d02393dffb44637b0",
-                    "nonce" : "0xc2b838ad4aae3a6f",
+                    "hash" : "0x5f1fe82a37046b28725df701ff2c000294c5a523f0495b311a975278ce79578d",
+                    "mixHash" : "0x53212cd00d1c62be8032b17e08c8e858f9582b1f5426bdda96831be028c2ea04",
+                    "nonce" : "0x41665d839493e7d3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d6625e74f9a3102a79b0d73dc429a6ee11545b5510b9e58d02393dffb44637b088c2b838ad4aae3a6ff85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a053212cd00d1c62be8032b17e08c8e858f9582b1f5426bdda96831be028c2ea048841665d839493e7d3f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe713e62de4bf119a9548dce80d20f2078537635afd84ca3bde7090f648ec3bf",
+        "lastblockhash" : "0x5f1fe82a37046b28725df701ff2c000294c5a523f0495b311a975278ce79578d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d39g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x26b663ec70b30364e0e1e458ccaada95bfd1c7c1303b456b0a7eaf84201a98c3",
-                    "mixHash" : "0xed3543039c23331bc26a051aaa0402ba69162f21ae3b3ffc33a4a14eaadf44a4",
-                    "nonce" : "0x88c55d846bfd20ee",
+                    "hash" : "0x46a78304339e692da224b6c81df7957ebbbd992a9b3e2c09ef1ec3584c862c31",
+                    "mixHash" : "0x24689f24ad7df9f95f681b4e7cc17bd65c211034bcaf0da5692217f6e10170d9",
+                    "nonce" : "0x5e4829c395801c6c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ed3543039c23331bc26a051aaa0402ba69162f21ae3b3ffc33a4a14eaadf44a48888c55d846bfd20eef85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a024689f24ad7df9f95f681b4e7cc17bd65c211034bcaf0da5692217f6e10170d9885e4829c395801c6cf85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26b663ec70b30364e0e1e458ccaada95bfd1c7c1303b456b0a7eaf84201a98c3",
+        "lastblockhash" : "0x46a78304339e692da224b6c81df7957ebbbd992a9b3e2c09ef1ec3584c862c31",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d39g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d39g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xeec9d21f5fa424b1d57efe802af0fa46d3c16e0f468a3102ab646e3e7353180c",
-                    "mixHash" : "0xc59b5f16d916c61584c4109b4688c2f933d6db774d2bf56d2878e7f3770634b0",
-                    "nonce" : "0xdbfdb712736938b9",
+                    "hash" : "0xc5d8ca1a52ca3feae6cdc8af91c8792d232d9c48d52e8a4b8d2c9f8f478944cd",
+                    "mixHash" : "0x8357bc7672f6ca4d84c9142ef7f25e813adc7dc55e3c4579a6b9f898f8c0c3df",
+                    "nonce" : "0x771099dd2a22f9dd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c59b5f16d916c61584c4109b4688c2f933d6db774d2bf56d2878e7f3770634b088dbfdb712736938b9f85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05740f9492c4f10c2b177fc9c68f63791e54982a03110afaaf6cdf137a001f779a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08357bc7672f6ca4d84c9142ef7f25e813adc7dc55e3c4579a6b9f898f8c0c3df88771099dd2a22f9ddf85ff85d800183061a8080830186a08e60016001600160015f60006000f31ba0c53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfaa05ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160015f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeec9d21f5fa424b1d57efe802af0fa46d3c16e0f468a3102ab646e3e7353180c",
+        "lastblockhash" : "0xc5d8ca1a52ca3feae6cdc8af91c8792d232d9c48d52e8a4b8d2c9f8f478944cd",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0.json
index bd74e67cf..ff5607e18 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d3g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x28b58a1749477893fb17a03051e95e1f4dd3fdd3e74796f764922f7837e624e6",
-                    "mixHash" : "0x6a45cf85b11ed76354c6416a21556373647cf64ccb2a496a9e56c38cb6e81658",
-                    "nonce" : "0xef042efb9e087f78",
+                    "hash" : "0x17e3009fab7b3604cbf1ffdad80701f31fc90ef1ace93a11b7045c2a6ca174cf",
+                    "mixHash" : "0x9ac4df0e2bf7c094275fa4323c74fc3d95f595d86de784cb295be7d37f4f1bc4",
+                    "nonce" : "0x782112af2b833e46",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06a45cf85b11ed76354c6416a21556373647cf64ccb2a496a9e56c38cb6e8165888ef042efb9e087f78f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09ac4df0e2bf7c094275fa4323c74fc3d95f595d86de784cb295be7d37f4f1bc488782112af2b833e46f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28b58a1749477893fb17a03051e95e1f4dd3fdd3e74796f764922f7837e624e6",
+        "lastblockhash" : "0x17e3009fab7b3604cbf1ffdad80701f31fc90ef1ace93a11b7045c2a6ca174cf",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d3g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5875c00d668e1c51c8d71372998853cb74ed8a37b6818b29c0ba87999cb75e34",
-                    "mixHash" : "0x53a49018ad7bf8cb82f2a1dc9182354a8d3543150c727085c00512a18c60b766",
-                    "nonce" : "0xaa4f0ae403628d59",
+                    "hash" : "0xfafe9822042c370c59721caa810412a82b2034ee3444b41dc5624bf06fab8730",
+                    "mixHash" : "0x203773e060f40ff5657c3eec125bf92c44ca51169d3535996d63476a314890fd",
+                    "nonce" : "0x335dbb9316c14365",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a053a49018ad7bf8cb82f2a1dc9182354a8d3543150c727085c00512a18c60b76688aa4f0ae403628d59f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0203773e060f40ff5657c3eec125bf92c44ca51169d3535996d63476a314890fd88335dbb9316c14365f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5875c00d668e1c51c8d71372998853cb74ed8a37b6818b29c0ba87999cb75e34",
+        "lastblockhash" : "0xfafe9822042c370c59721caa810412a82b2034ee3444b41dc5624bf06fab8730",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d3g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x150b2aacf656e3502917101a19d2bbd996dfdde16ce0e3f7b4a728f6087da9ae",
-                    "mixHash" : "0x4577149b5afbe1193dccda9eb658837f33c51a70a89d9a93225b50e0b8742d41",
-                    "nonce" : "0x229df1dddf5c9ccc",
+                    "hash" : "0x0a27700469a4d6268a40dc362426d7c81cf23aa05973980794d22db524a6498e",
+                    "mixHash" : "0x02c43df4c4eca42d9d480abfe0fcaeca94d6e976adcb7f3d524d0637f98f78cd",
+                    "nonce" : "0xb4419c175a77508e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04577149b5afbe1193dccda9eb658837f33c51a70a89d9a93225b50e0b8742d4188229df1dddf5c9cccf85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002c43df4c4eca42d9d480abfe0fcaeca94d6e976adcb7f3d524d0637f98f78cd88b4419c175a77508ef85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x150b2aacf656e3502917101a19d2bbd996dfdde16ce0e3f7b4a728f6087da9ae",
+        "lastblockhash" : "0x0a27700469a4d6268a40dc362426d7c81cf23aa05973980794d22db524a6498e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d3g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x292b085177eb840aa8abc5d019378a7887909844a4dddf1d14fc4921c039e3c3",
-                    "mixHash" : "0x244005fc1e1bc4e8741922188af0a514c8bbcc2098404c77783c46dd8f101981",
-                    "nonce" : "0x6b2e04d0d37c4fba",
+                    "hash" : "0x32e7ab1f13482a950a90f1cf24baa13182639d267f940b9d32e70cc66b039ad7",
+                    "mixHash" : "0xb424132d11f0830b3c6454a6f867cf745bccfda743f872ec2680d7a28e29f403",
+                    "nonce" : "0x83a00a7c40145fe8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0244005fc1e1bc4e8741922188af0a514c8bbcc2098404c77783c46dd8f101981886b2e04d0d37c4fbaf85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b424132d11f0830b3c6454a6f867cf745bccfda743f872ec2680d7a28e29f4038883a00a7c40145fe8f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x292b085177eb840aa8abc5d019378a7887909844a4dddf1d14fc4921c039e3c3",
+        "lastblockhash" : "0x32e7ab1f13482a950a90f1cf24baa13182639d267f940b9d32e70cc66b039ad7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d3g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x87ec0aec99c4bfec773874e3b77615edb24b7e4da0baf7e50fa5e8a74b255308",
-                    "mixHash" : "0xecec63835e3d6b59615347bd85f3ef03c2a82dcbe73b105d759ef244c66a7b1c",
-                    "nonce" : "0x78a3829b2fdeaae1",
+                    "hash" : "0x394b6f703200cfda5dfbae258d591147b92a75c8187630be00b55ccef98e039e",
+                    "mixHash" : "0x1b015dd7b2886890c9a604795a5db176dca2bce338e380d0770eeaea2fa3ab9f",
+                    "nonce" : "0x036024139b15815b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ecec63835e3d6b59615347bd85f3ef03c2a82dcbe73b105d759ef244c66a7b1c8878a3829b2fdeaae1f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01b015dd7b2886890c9a604795a5db176dca2bce338e380d0770eeaea2fa3ab9f88036024139b15815bf85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ec0aec99c4bfec773874e3b77615edb24b7e4da0baf7e50fa5e8a74b255308",
+        "lastblockhash" : "0x394b6f703200cfda5dfbae258d591147b92a75c8187630be00b55ccef98e039e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d3g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d3g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x58cab9d0fba59da6c47b7b7dc64e8571c873af57aedb0524a6cdafb378a5add9",
-                    "mixHash" : "0x74b816de3f940a3bef5b93b2d07da422e51682ea92039ac8fd75a23df726402b",
-                    "nonce" : "0x35e54253c7b038a2",
+                    "hash" : "0x2133b798fb7feeb5d298f4d3da7543373d14b919a0052c627eb97621af8aae0d",
+                    "mixHash" : "0x59753be308c6881eb97839ef5ccbdb30d55785440f8e574e45e91daee41a42c5",
+                    "nonce" : "0x0150a4e0cf67267c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a074b816de3f940a3bef5b93b2d07da422e51682ea92039ac8fd75a23df726402b8835e54253c7b038a2f85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b13b472653c0baa1c16d386f197b8f647643d4aef71aaa39a2cabc09890e94c3a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a059753be308c6881eb97839ef5ccbdb30d55785440f8e574e45e91daee41a42c5880150a4e0cf67267cf85ff85d800183061a8080830186a08e60016001600160010e60006000f31ca08187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527a06e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010e60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58cab9d0fba59da6c47b7b7dc64e8571c873af57aedb0524a6cdafb378a5add9",
+        "lastblockhash" : "0x2133b798fb7feeb5d298f4d3da7543373d14b919a0052c627eb97621af8aae0d",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0.json
index 9ff3c7101..6f60afdae 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d40g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3b097b67b696d6fccf1cd6f268132cc2f20dae5d2b97635a4765558239008bde",
-                    "mixHash" : "0xa1cb75ff4ad13b0bb67e305e9d704358a5917ffd5221769eb122e3aa74309b1d",
-                    "nonce" : "0x4388bc8b65fffa57",
+                    "hash" : "0xfd6e5f286216d17ba11eeb6de00cdc584d54c958243e69f271c666e3fb5ef9ea",
+                    "mixHash" : "0xd616a7dd4e2b4abccb50982419580a6ec59256fdf38a46fe494e158c51da1ca5",
+                    "nonce" : "0x2158728e12f06f17",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a1cb75ff4ad13b0bb67e305e9d704358a5917ffd5221769eb122e3aa74309b1d884388bc8b65fffa57f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d616a7dd4e2b4abccb50982419580a6ec59256fdf38a46fe494e158c51da1ca5882158728e12f06f17f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b097b67b696d6fccf1cd6f268132cc2f20dae5d2b97635a4765558239008bde",
+        "lastblockhash" : "0xfd6e5f286216d17ba11eeb6de00cdc584d54c958243e69f271c666e3fb5ef9ea",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d40g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0897bb6ac27cbf327cc857b717fb83acdc56a8608acdda1f13dd42360f524f55",
-                    "mixHash" : "0xd444286585e0f7215596ce61761c329fb78213e99bf5351c6008b783f8070c4a",
-                    "nonce" : "0x77d59a2edc2f44a5",
+                    "hash" : "0x99ef0ed01f3ff97751d96954697ab4fed395a65cd12006640f623273cb8ca567",
+                    "mixHash" : "0x93c6dd5236f3d2f14cf33d53041a4d6e79e6bcb2338cafb1178b5950964245ea",
+                    "nonce" : "0x417abaf3f8fe3a3c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d444286585e0f7215596ce61761c329fb78213e99bf5351c6008b783f8070c4a8877d59a2edc2f44a5f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a093c6dd5236f3d2f14cf33d53041a4d6e79e6bcb2338cafb1178b5950964245ea88417abaf3f8fe3a3cf85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0897bb6ac27cbf327cc857b717fb83acdc56a8608acdda1f13dd42360f524f55",
+        "lastblockhash" : "0x99ef0ed01f3ff97751d96954697ab4fed395a65cd12006640f623273cb8ca567",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d40g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe991002acde35ac7ea53cbaf68eed386cccaf95f5985e081a4ff2abe4d307bc0",
-                    "mixHash" : "0x4e6dc784635767a807742dc348225f4b42668b17a13c5c2b11908c90d0fa019e",
-                    "nonce" : "0xe056409fbe86d7db",
+                    "hash" : "0x6cdd15e3673d943f307e7196ea7330037d8527badb54480813b6dd9bcf05efe6",
+                    "mixHash" : "0x20fab5b471aad49ba384b469ddb59e3fb6a04ab4e06cc887bf33fd1933f2238a",
+                    "nonce" : "0x4897fa7b6102bd85",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e6dc784635767a807742dc348225f4b42668b17a13c5c2b11908c90d0fa019e88e056409fbe86d7dbf85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a020fab5b471aad49ba384b469ddb59e3fb6a04ab4e06cc887bf33fd1933f2238a884897fa7b6102bd85f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe991002acde35ac7ea53cbaf68eed386cccaf95f5985e081a4ff2abe4d307bc0",
+        "lastblockhash" : "0x6cdd15e3673d943f307e7196ea7330037d8527badb54480813b6dd9bcf05efe6",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d40g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0db464c9a2f52abc8911da47d48b2ca9adb5242e715e137e30f857d88c670f17",
-                    "mixHash" : "0x3aa5fc388cb86d5f27bf2dc64b4a963e216fca35030dc0875ec1229ca5e5bf05",
-                    "nonce" : "0x863c13e0170315c8",
+                    "hash" : "0xd7dd3b59c0cf52b53f15f5cffc3a96e77dcc11407b2ab2a96d5fec73124fff31",
+                    "mixHash" : "0x3b0224490fa8a9331add3c664aeb4036dcece6648d8d02c026277ecfcc3e794a",
+                    "nonce" : "0xcb0224deb3738a60",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03aa5fc388cb86d5f27bf2dc64b4a963e216fca35030dc0875ec1229ca5e5bf0588863c13e0170315c8f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b0224490fa8a9331add3c664aeb4036dcece6648d8d02c026277ecfcc3e794a88cb0224deb3738a60f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0db464c9a2f52abc8911da47d48b2ca9adb5242e715e137e30f857d88c670f17",
+        "lastblockhash" : "0xd7dd3b59c0cf52b53f15f5cffc3a96e77dcc11407b2ab2a96d5fec73124fff31",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d40g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9b1273db13049b0fc09f688786cff49801a80efe19e591dafaccbdf089484c17",
-                    "mixHash" : "0x476e13bee6b7a06e5b16e3e931009dc8431c9305f722ac422d27e503a4b3308e",
-                    "nonce" : "0x079fb25310449b12",
+                    "hash" : "0x8c443b2b8a5c44721446820596a64f3c3520e211060f7a5a271a71c7bae295e5",
+                    "mixHash" : "0x5be24dccb013f5791c489d0d2eec55e02a9a22445bedb1d24386450037f16a65",
+                    "nonce" : "0x7831f11a8ddf029a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0476e13bee6b7a06e5b16e3e931009dc8431c9305f722ac422d27e503a4b3308e88079fb25310449b12f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05be24dccb013f5791c489d0d2eec55e02a9a22445bedb1d24386450037f16a65887831f11a8ddf029af85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b1273db13049b0fc09f688786cff49801a80efe19e591dafaccbdf089484c17",
+        "lastblockhash" : "0x8c443b2b8a5c44721446820596a64f3c3520e211060f7a5a271a71c7bae295e5",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d40g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d40g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xaf2236c5837f4a6bc4a2950b90db7206c9290f393582a4382d09455013f858e1",
-                    "mixHash" : "0xba631a5a7b3e21f750be7efed3824738b2bfc38bba0f13c55ec6850e18671710",
-                    "nonce" : "0x210b332fb27e4dee",
+                    "hash" : "0xf59b18eed6f50ac2de6ba3ad583a3542d4037f6651aa949a04277fa7ff8443de",
+                    "mixHash" : "0x6ad70d9c6a707251351f60e2afdd8e945ec5357dca8085a16a40881bd2c838b0",
+                    "nonce" : "0x1e094e37fac3a9c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ba631a5a7b3e21f750be7efed3824738b2bfc38bba0f13c55ec6850e1867171088210b332fb27e4deef85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd12709fca6bccc7ace5f2d4cb6913268cce8c0d98fe3b9abe3af379973f3ecfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ad70d9c6a707251351f60e2afdd8e945ec5357dca8085a16a40881bd2c838b0881e094e37fac3a9c0f85ff85d800183061a8080830186a08e6001600160016001a560006000f31ba01d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318ba04063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf2236c5837f4a6bc4a2950b90db7206c9290f393582a4382d09455013f858e1",
+        "lastblockhash" : "0xf59b18eed6f50ac2de6ba3ad583a3542d4037f6651aa949a04277fa7ff8443de",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0.json
index 4f5b37394..1c198c4be 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d41g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2093a62085d091e727c875b9d742cf1c69d6ba895d9ae5a99fb3971fc8dc33dd",
-                    "mixHash" : "0x19fa3fcd8a5f40ea76a91f1c323aaae0a6c07c5712552f3775481d645f87ab3c",
-                    "nonce" : "0xd624817c8cbac381",
+                    "hash" : "0x1ee857ec72996954a37068c989b72f59a3ed0c21d0f4a1a294d1207a47befcad",
+                    "mixHash" : "0xba645dbf592d592accd8a4d082d7a4e089001ac7d2af835c7736a181284d64a1",
+                    "nonce" : "0xcb30a3fa977cb231",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a019fa3fcd8a5f40ea76a91f1c323aaae0a6c07c5712552f3775481d645f87ab3c88d624817c8cbac381f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ba645dbf592d592accd8a4d082d7a4e089001ac7d2af835c7736a181284d64a188cb30a3fa977cb231f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2093a62085d091e727c875b9d742cf1c69d6ba895d9ae5a99fb3971fc8dc33dd",
+        "lastblockhash" : "0x1ee857ec72996954a37068c989b72f59a3ed0c21d0f4a1a294d1207a47befcad",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d41g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2ac18d834d57c1d572060912237bb54450438c42f78f91d2521b914879101b06",
-                    "mixHash" : "0x9dafad06489d66e872e2e3c861b2aa5ff5dd2cbdb9ef6dd43296c24420aeceb1",
-                    "nonce" : "0x9064c85ad3ed4c03",
+                    "hash" : "0x4e0e80f0fad7564820d9633d52dc6b4cdf1cdca3fbe8e7e42ac3e7d881609b52",
+                    "mixHash" : "0xd703e1f0995468487ef20e1081488c30fd27d655cf417e682819d384292358fa",
+                    "nonce" : "0x72dc34708fa8c389",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09dafad06489d66e872e2e3c861b2aa5ff5dd2cbdb9ef6dd43296c24420aeceb1889064c85ad3ed4c03f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d703e1f0995468487ef20e1081488c30fd27d655cf417e682819d384292358fa8872dc34708fa8c389f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ac18d834d57c1d572060912237bb54450438c42f78f91d2521b914879101b06",
+        "lastblockhash" : "0x4e0e80f0fad7564820d9633d52dc6b4cdf1cdca3fbe8e7e42ac3e7d881609b52",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d41g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x739686d41f057d69e65b9d68b908461c96e0bed8d9da39fbe9812ecc298036e3",
-                    "mixHash" : "0xd3dfcd1c402e80f1ea99cd5db9835248a051e0a92ce21fa2476e1e15d89cca62",
-                    "nonce" : "0x38d3ed1e896fa309",
+                    "hash" : "0xbd4a23a74e205d4959905f450661e573e8d23435c3760bd5421c33057088d547",
+                    "mixHash" : "0x3171907ab4f68a4d1b3351b21f6aabb11b502b8bc59021eb034f48fcd1b0d156",
+                    "nonce" : "0x9bb8ac68cd029e44",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3dfcd1c402e80f1ea99cd5db9835248a051e0a92ce21fa2476e1e15d89cca628838d3ed1e896fa309f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03171907ab4f68a4d1b3351b21f6aabb11b502b8bc59021eb034f48fcd1b0d156889bb8ac68cd029e44f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x739686d41f057d69e65b9d68b908461c96e0bed8d9da39fbe9812ecc298036e3",
+        "lastblockhash" : "0xbd4a23a74e205d4959905f450661e573e8d23435c3760bd5421c33057088d547",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d41g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xedd2581740c1905ca7f8af58827c92d0d00d6e13bc0bb527a7fa92baaf8a56d1",
-                    "mixHash" : "0xaf0196b4766bd1971d5a3a7e43380b0b19b0065322a165eed44b7c37e75282f1",
-                    "nonce" : "0x734269719ac4fdf9",
+                    "hash" : "0xf376d5e39955e2553167c6391c47454965709221c2189d6b69d1ac441c5e3233",
+                    "mixHash" : "0xd3c357658203f7010ca2152fe16111ea3e2c8c0f7057a402d3ef08932171846d",
+                    "nonce" : "0xbf330e823469cec1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0af0196b4766bd1971d5a3a7e43380b0b19b0065322a165eed44b7c37e75282f188734269719ac4fdf9f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3c357658203f7010ca2152fe16111ea3e2c8c0f7057a402d3ef08932171846d88bf330e823469cec1f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedd2581740c1905ca7f8af58827c92d0d00d6e13bc0bb527a7fa92baaf8a56d1",
+        "lastblockhash" : "0xf376d5e39955e2553167c6391c47454965709221c2189d6b69d1ac441c5e3233",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d41g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9b1dc8bc0cfa647628a8996ffbb09efcd9994faa0327aba34fb4aad8493744bb",
-                    "mixHash" : "0x16275ee3e2450943077bd39c04082b9f44a71774bd5db6848c6d2cf77d0e1f43",
-                    "nonce" : "0x1e418e3a3296bd6d",
+                    "hash" : "0xfba5e7fbb244e9aa9f9cf854104100412fce6454a88b29f1c5576df9337047aa",
+                    "mixHash" : "0xad495d3e01c88fc95e143334a7a636b40a9766b0d232b4ccddcd3a05ff41d30a",
+                    "nonce" : "0xbdf6d900bbeb395d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a016275ee3e2450943077bd39c04082b9f44a71774bd5db6848c6d2cf77d0e1f43881e418e3a3296bd6df85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ad495d3e01c88fc95e143334a7a636b40a9766b0d232b4ccddcd3a05ff41d30a88bdf6d900bbeb395df85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b1dc8bc0cfa647628a8996ffbb09efcd9994faa0327aba34fb4aad8493744bb",
+        "lastblockhash" : "0xfba5e7fbb244e9aa9f9cf854104100412fce6454a88b29f1c5576df9337047aa",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d41g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d41g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x57bccd6b6217092eaf407fe3591e15e18727bb34d3ae9e2e88d0bf30feebc3a4",
-                    "mixHash" : "0x313858401d4f60fc6ac45897d261ed7593dbbf1f62fcb43ef2aa6ec3b38f486c",
-                    "nonce" : "0x30185782b59b7701",
+                    "hash" : "0x42e168cdcb531adf982dfb2431eb1eb8f91be2b072233ab80288ae515d5ff36d",
+                    "mixHash" : "0x255568f2edbba38848ea64f4f5a21376e28ad5edf3de8fe12410e9fb501bb9c3",
+                    "nonce" : "0xeb2581b5ab187913",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x83d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0313858401d4f60fc6ac45897d261ed7593dbbf1f62fcb43ef2aa6ec3b38f486c8830185782b59b7701f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea083d273057444c0bdeeb5ab82f72057687b8c9a9fcf78fe3691699f527afa6123a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0255568f2edbba38848ea64f4f5a21376e28ad5edf3de8fe12410e9fb501bb9c388eb2581b5ab187913f85ff85d800183061a8080830186a08e6001600160016001a660006000f31ca0641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166a06c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afcc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57bccd6b6217092eaf407fe3591e15e18727bb34d3ae9e2e88d0bf30feebc3a4",
+        "lastblockhash" : "0x42e168cdcb531adf982dfb2431eb1eb8f91be2b072233ab80288ae515d5ff36d",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0.json
index b15aedeb8..b9bc1bebe 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d42g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xca8f5f85117b8cf6b273c14c3052a721120687fa086cf1829bec385af31bb83d",
-                    "mixHash" : "0xc58bef719fa5072c3096d812a4f6c6f4000d71a7eec50bac88cd602f9ec662aa",
-                    "nonce" : "0xfd22f8eafa885008",
+                    "hash" : "0xe41db23efcff5d762d3557a4ae47e6ee9edcb36a5a22c04bc64bef196ddadc90",
+                    "mixHash" : "0xa5de3c54458630cb35114756d4d3f1f06967fe1c941fe92b859fcfdbf7e78df5",
+                    "nonce" : "0x5ed4a8436b5ae53f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c58bef719fa5072c3096d812a4f6c6f4000d71a7eec50bac88cd602f9ec662aa88fd22f8eafa885008f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a5de3c54458630cb35114756d4d3f1f06967fe1c941fe92b859fcfdbf7e78df5885ed4a8436b5ae53ff85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca8f5f85117b8cf6b273c14c3052a721120687fa086cf1829bec385af31bb83d",
+        "lastblockhash" : "0xe41db23efcff5d762d3557a4ae47e6ee9edcb36a5a22c04bc64bef196ddadc90",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d42g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x277823f94f52ee2c8ba5d97353fe0d9445729c83fab4b24248856b57f5135f57",
-                    "mixHash" : "0x72768212858e41225c51c8df3c0a13803763d0312a4cbe8695aab6278d28254b",
-                    "nonce" : "0x4efe7bbf14d9f61d",
+                    "hash" : "0x987c652189bb2dc2a3e86647a1daa88dc6d17b3fedea627c7a7e795d61405fb4",
+                    "mixHash" : "0xf1a1d0e41cacd074cfb1532d40307d4aa53ed78adcac2a79f3b57f14544eb9ac",
+                    "nonce" : "0x7168c031160b0ec8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a072768212858e41225c51c8df3c0a13803763d0312a4cbe8695aab6278d28254b884efe7bbf14d9f61df85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f1a1d0e41cacd074cfb1532d40307d4aa53ed78adcac2a79f3b57f14544eb9ac887168c031160b0ec8f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x277823f94f52ee2c8ba5d97353fe0d9445729c83fab4b24248856b57f5135f57",
+        "lastblockhash" : "0x987c652189bb2dc2a3e86647a1daa88dc6d17b3fedea627c7a7e795d61405fb4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d42g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbd1fe1fb53c79549de1820e3785979349fb730b7f4c68d60fbc51184e699408f",
-                    "mixHash" : "0x51c405ae80fa5773a46e150a2b1ba67e2036fad0a74a26e76c74a6e13c9a68f7",
-                    "nonce" : "0x4202036ff1af8c5d",
+                    "hash" : "0x43614e395f1594bb8e72fc4d43268e398dd64a1997f7dd93f0bdf87ea1b5c12a",
+                    "mixHash" : "0xe37d3aaf03909210232c39068319bd5b347ae99f5cd2160fbd8c8d40aa83a966",
+                    "nonce" : "0x27c6840f3042ff94",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a051c405ae80fa5773a46e150a2b1ba67e2036fad0a74a26e76c74a6e13c9a68f7884202036ff1af8c5df85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e37d3aaf03909210232c39068319bd5b347ae99f5cd2160fbd8c8d40aa83a9668827c6840f3042ff94f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd1fe1fb53c79549de1820e3785979349fb730b7f4c68d60fbc51184e699408f",
+        "lastblockhash" : "0x43614e395f1594bb8e72fc4d43268e398dd64a1997f7dd93f0bdf87ea1b5c12a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d42g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2aea255fd4646fcce2357fccb1146d4919af13fce5989f754a2dd23a89581aff",
-                    "mixHash" : "0x0adda8aedb1fb0e27caa219d556c689e132c5bb3fbb46fefa263fc3f026abbf2",
-                    "nonce" : "0xdd40b67442870fe7",
+                    "hash" : "0x07ab7acd74d6e9ad6401b1d44549e5292c0d2006247c84ccb5c6162bcabbe384",
+                    "mixHash" : "0x373c43094d2622f8c244396186d3e147fc2c19de1a0b851b44537b5a7c94f44f",
+                    "nonce" : "0xeea75bdd21f75ffc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00adda8aedb1fb0e27caa219d556c689e132c5bb3fbb46fefa263fc3f026abbf288dd40b67442870fe7f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0373c43094d2622f8c244396186d3e147fc2c19de1a0b851b44537b5a7c94f44f88eea75bdd21f75ffcf85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2aea255fd4646fcce2357fccb1146d4919af13fce5989f754a2dd23a89581aff",
+        "lastblockhash" : "0x07ab7acd74d6e9ad6401b1d44549e5292c0d2006247c84ccb5c6162bcabbe384",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d42g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x63fce9751f65dffb8c7d60b233c4ad9c4723fefd10c1d0b9ed1629b63223078a",
-                    "mixHash" : "0x73847654620c686286cfd34e9234f38363b30f7638fa39ebd225e3c3e437e7d2",
-                    "nonce" : "0xcf9822a51d83be45",
+                    "hash" : "0xc1acadc11c79e0fd76bfbd1558469b4dd7a516af4e8a5ecb1f49784e6783a1a8",
+                    "mixHash" : "0x08c484acac3a1ea46992bc15383de64b906499397dacf4d597e33740fbf477a3",
+                    "nonce" : "0xd009f27f5334f2b3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a073847654620c686286cfd34e9234f38363b30f7638fa39ebd225e3c3e437e7d288cf9822a51d83be45f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a008c484acac3a1ea46992bc15383de64b906499397dacf4d597e33740fbf477a388d009f27f5334f2b3f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63fce9751f65dffb8c7d60b233c4ad9c4723fefd10c1d0b9ed1629b63223078a",
+        "lastblockhash" : "0xc1acadc11c79e0fd76bfbd1558469b4dd7a516af4e8a5ecb1f49784e6783a1a8",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d42g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d42g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1d5667fc6a10495132e8a410963a2f1afc4c5745edaf64e1ca8622f108c0cd30",
-                    "mixHash" : "0x6ae08b6954fbae4fb85c6137beb81c342ae5a24ffa5a2ba1184cb17b2cb2ceae",
-                    "nonce" : "0x820a02e73cbb2593",
+                    "hash" : "0xa98ca743e44adf721df55c9d7bd93c74d9b4879512f0500583b335714c047bb4",
+                    "mixHash" : "0x3eb84af3995789739163503888be43e589fc9343c5f7d7c413a99875bda364fe",
+                    "nonce" : "0x88e59c08a0d6a8a4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xcdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ae08b6954fbae4fb85c6137beb81c342ae5a24ffa5a2ba1184cb17b2cb2ceae88820a02e73cbb2593f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cdad1200d7737835fe5a287f16c47d3a9c6669303c90d3b2d013bdf6a21b927fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03eb84af3995789739163503888be43e589fc9343c5f7d7c413a99875bda364fe8888e59c08a0d6a8a4f85ff85d800183061a8080830186a08e6001600160016001a760006000f31ca0b4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2ca04cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d5667fc6a10495132e8a410963a2f1afc4c5745edaf64e1ca8622f108c0cd30",
+        "lastblockhash" : "0xa98ca743e44adf721df55c9d7bd93c74d9b4879512f0500583b335714c047bb4",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0.json
index 61db7810c..0011ce4b4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d43g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xed056d1bb9ca9aae325697c36b0fed182a2ef220e540834c64d700f1a4414467",
-                    "mixHash" : "0x66294ad78933d588220ca74d1d0f6e4f12cb97222e5d07f673aa642f7692576f",
-                    "nonce" : "0x30c57d90cae1193b",
+                    "hash" : "0xded9769fddde2ca436752535a6699dd8232c8fff4b82242236c8e4ade3dcb884",
+                    "mixHash" : "0x72f5cbbb3b745b4505881b434fb81d082713cea44b7e43c4c406f1acdc65ad81",
+                    "nonce" : "0x9cdfc8e54b3bb58d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a066294ad78933d588220ca74d1d0f6e4f12cb97222e5d07f673aa642f7692576f8830c57d90cae1193bf85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a072f5cbbb3b745b4505881b434fb81d082713cea44b7e43c4c406f1acdc65ad81889cdfc8e54b3bb58df85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed056d1bb9ca9aae325697c36b0fed182a2ef220e540834c64d700f1a4414467",
+        "lastblockhash" : "0xded9769fddde2ca436752535a6699dd8232c8fff4b82242236c8e4ade3dcb884",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d43g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xac5feb476493370c8988cdb575615ece5f89e0b5893f98b7628e3c92a3495b18",
-                    "mixHash" : "0x02836d870bf53b9cf3cfb66b3583361b7d1b5ebd2c8537d0dd352174318d1e1b",
-                    "nonce" : "0xbe4f709bf0eb8e23",
+                    "hash" : "0x4d9f8f210a07a3c6593486a3b4c8a44c42782a8853da0206dc74ca14cc84c835",
+                    "mixHash" : "0xbb19e1c16bcda92d86f76c4659560263660cce2ded9560b0269a9043edb1b42a",
+                    "nonce" : "0xc7f2151025b730e4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a002836d870bf53b9cf3cfb66b3583361b7d1b5ebd2c8537d0dd352174318d1e1b88be4f709bf0eb8e23f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb19e1c16bcda92d86f76c4659560263660cce2ded9560b0269a9043edb1b42a88c7f2151025b730e4f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac5feb476493370c8988cdb575615ece5f89e0b5893f98b7628e3c92a3495b18",
+        "lastblockhash" : "0x4d9f8f210a07a3c6593486a3b4c8a44c42782a8853da0206dc74ca14cc84c835",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d43g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x18035bf5a79d7ad0a390a0627764b63f6c1327c2146e5ee1f1e234cfdb687c23",
-                    "mixHash" : "0x0d23260e9d5331665c8e1761a68e87c82437c8d4c11fb0f35c544ce46049921c",
-                    "nonce" : "0x494d7d06375e2344",
+                    "hash" : "0x8a977e753b6a54b8a27f1ea1c4485e088e4c5dbd73311fdfeea1c21051906d4f",
+                    "mixHash" : "0x624f1b43627f7c42a51f33f9f14d3f8250aec57f6561afc9fea671f809e29278",
+                    "nonce" : "0xb44753e3babbddb2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d23260e9d5331665c8e1761a68e87c82437c8d4c11fb0f35c544ce46049921c88494d7d06375e2344f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0624f1b43627f7c42a51f33f9f14d3f8250aec57f6561afc9fea671f809e2927888b44753e3babbddb2f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18035bf5a79d7ad0a390a0627764b63f6c1327c2146e5ee1f1e234cfdb687c23",
+        "lastblockhash" : "0x8a977e753b6a54b8a27f1ea1c4485e088e4c5dbd73311fdfeea1c21051906d4f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d43g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x49f0c2c12433d20efad67d4c76d430ecd065e41dab7ef1b1035314f6a92494e5",
-                    "mixHash" : "0x17499b6bb6a3a8f478dcc6c60ac29364ca475dd702343c6cec0ff00a8dd01d17",
-                    "nonce" : "0xd7ad8b17c81bb923",
+                    "hash" : "0x933a971f6c52879814272527ca0b456ea592581cb765c2e4c7ed630786104fad",
+                    "mixHash" : "0x32b7843db339f4bba951b3924380d10bd4ee9287798f26acd7566968d5301ff6",
+                    "nonce" : "0x6837f2e1f65cbfbb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017499b6bb6a3a8f478dcc6c60ac29364ca475dd702343c6cec0ff00a8dd01d1788d7ad8b17c81bb923f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032b7843db339f4bba951b3924380d10bd4ee9287798f26acd7566968d5301ff6886837f2e1f65cbfbbf85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49f0c2c12433d20efad67d4c76d430ecd065e41dab7ef1b1035314f6a92494e5",
+        "lastblockhash" : "0x933a971f6c52879814272527ca0b456ea592581cb765c2e4c7ed630786104fad",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d43g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9dd7ff060f099e38284d2157ff74396931bc87e14a7f375e888860fb8718e81c",
-                    "mixHash" : "0x854453c7c5023d90aa752fec0f6faa03d20598a1cc71464921ab88147aede1a4",
-                    "nonce" : "0xea18ee526512e037",
+                    "hash" : "0x08e4336faf757d1ad6d5b94e676b073d225164111a0e0b03c717b604bd054fbc",
+                    "mixHash" : "0x977f0c90cbe806c55a8da26fe340858bc993da6f37cb93fba23bad31ec2dcd31",
+                    "nonce" : "0xbf46d33409007a66",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0854453c7c5023d90aa752fec0f6faa03d20598a1cc71464921ab88147aede1a488ea18ee526512e037f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0977f0c90cbe806c55a8da26fe340858bc993da6f37cb93fba23bad31ec2dcd3188bf46d33409007a66f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dd7ff060f099e38284d2157ff74396931bc87e14a7f375e888860fb8718e81c",
+        "lastblockhash" : "0x08e4336faf757d1ad6d5b94e676b073d225164111a0e0b03c717b604bd054fbc",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d43g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d43g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbe1c90ea73705829ad6f379fe736c3c6d1855490c70f309694ef1480b22eeebe",
-                    "mixHash" : "0x73cc143833b029afc068d1ceb944535a1f69d56d0679cc05b22351002e62178d",
-                    "nonce" : "0xce61bc1364468880",
+                    "hash" : "0xc492ae5b33977abea64bd391ff3a9f798adf5ca5246ff6c727c6fe39baa78c01",
+                    "mixHash" : "0xa8b72bf07b9ae21111bbcc97aabb61073a1e2eba77d725a9afbe8f0d2b568f2c",
+                    "nonce" : "0x86c45cd16bd60cf1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x8e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a073cc143833b029afc068d1ceb944535a1f69d56d0679cc05b22351002e62178d88ce61bc1364468880f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08e446f75c8af0295e1e6716b520de5a62b195bcb44384601588ec18ce5700fc4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a8b72bf07b9ae21111bbcc97aabb61073a1e2eba77d725a9afbe8f0d2b568f2c8886c45cd16bd60cf1f85ff85d800183061a8080830186a08e6001600160016001a860006000f31ca05d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2a001a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913bac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe1c90ea73705829ad6f379fe736c3c6d1855490c70f309694ef1480b22eeebe",
+        "lastblockhash" : "0xc492ae5b33977abea64bd391ff3a9f798adf5ca5246ff6c727c6fe39baa78c01",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0.json
index ad62e031f..916229d68 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d44g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0fbddad965b08c8649fa677348b59f9f919f1aafa1acde4ba05e830d5b71622b",
-                    "mixHash" : "0x6002fe1315173384db6779bf7e34585ea550a2778050f22b724135259bf7fcbf",
-                    "nonce" : "0xa59e367e3878c465",
+                    "hash" : "0x2be5682acbf68d522a1e297826faab8299c477e7ed94b5d5595f3fa9194c383e",
+                    "mixHash" : "0x63d3605512739c55ddbae54accd4109b981609a715499ac5b7531869f36fd63e",
+                    "nonce" : "0xadff97bc55ba97aa",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06002fe1315173384db6779bf7e34585ea550a2778050f22b724135259bf7fcbf88a59e367e3878c465f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a063d3605512739c55ddbae54accd4109b981609a715499ac5b7531869f36fd63e88adff97bc55ba97aaf85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fbddad965b08c8649fa677348b59f9f919f1aafa1acde4ba05e830d5b71622b",
+        "lastblockhash" : "0x2be5682acbf68d522a1e297826faab8299c477e7ed94b5d5595f3fa9194c383e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d44g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4351cacdcfb8f4094f8e6f2489a6e3c5b3f494d6bacffca631b9fe5cb2d458eb",
-                    "mixHash" : "0x09913a8fe02287f8fe7919a952694f60a63d9becd710ffa96c23a290fdc7b42e",
-                    "nonce" : "0xa4d2a1107173edeb",
+                    "hash" : "0x22a2890b0fec4d5f25c8dda34178c0a6d5f2e2ca27125379445e0f56d590a06d",
+                    "mixHash" : "0x3bab4f2a7430c33263934685c483cc29fa7bfccfb298f9bb95bea03b8155d44a",
+                    "nonce" : "0xbec83f125cd20f7b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a009913a8fe02287f8fe7919a952694f60a63d9becd710ffa96c23a290fdc7b42e88a4d2a1107173edebf85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03bab4f2a7430c33263934685c483cc29fa7bfccfb298f9bb95bea03b8155d44a88bec83f125cd20f7bf85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4351cacdcfb8f4094f8e6f2489a6e3c5b3f494d6bacffca631b9fe5cb2d458eb",
+        "lastblockhash" : "0x22a2890b0fec4d5f25c8dda34178c0a6d5f2e2ca27125379445e0f56d590a06d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d44g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdfc6f7f890f9e00dcaf7738da2dd94ba357feb199693dc113f54263e255e536a",
-                    "mixHash" : "0xd19c5753cd9df7fbf9329a68df1157a09e3bff9c102ee4a37bf37aa5cce5c9ab",
-                    "nonce" : "0x2974e6f05d7a4c78",
+                    "hash" : "0x7d8cc04fce9b434b0f7e10dce3627e41aed834b345b56cbe12270b23458b3a27",
+                    "mixHash" : "0xd888c9a145f3656e1e038b5f4d17d115efc42f0cc9fd98d58270f54883fc13fb",
+                    "nonce" : "0xdaaf7c38cd26177d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d19c5753cd9df7fbf9329a68df1157a09e3bff9c102ee4a37bf37aa5cce5c9ab882974e6f05d7a4c78f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d888c9a145f3656e1e038b5f4d17d115efc42f0cc9fd98d58270f54883fc13fb88daaf7c38cd26177df85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfc6f7f890f9e00dcaf7738da2dd94ba357feb199693dc113f54263e255e536a",
+        "lastblockhash" : "0x7d8cc04fce9b434b0f7e10dce3627e41aed834b345b56cbe12270b23458b3a27",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d44g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4e39e09862b59df46574a8bf4c3969ae4072a744246673831b6cd87e89902427",
-                    "mixHash" : "0x67431397b9233234a43b8863e5d3d17339b5befa3fa4474ae83e3085abba3901",
-                    "nonce" : "0xf4c533736cc211e1",
+                    "hash" : "0x8d96f051ed9cb69f2136887c5e0cf9e9e4fbae9053795d483db0008aaa29614b",
+                    "mixHash" : "0x53e76374cf5e95e3976ed62ccf6e631e71bc853f3ebea3cdcabda7a2424b39b1",
+                    "nonce" : "0x6b2693b9b00fa3c8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a067431397b9233234a43b8863e5d3d17339b5befa3fa4474ae83e3085abba390188f4c533736cc211e1f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a053e76374cf5e95e3976ed62ccf6e631e71bc853f3ebea3cdcabda7a2424b39b1886b2693b9b00fa3c8f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e39e09862b59df46574a8bf4c3969ae4072a744246673831b6cd87e89902427",
+        "lastblockhash" : "0x8d96f051ed9cb69f2136887c5e0cf9e9e4fbae9053795d483db0008aaa29614b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d44g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2c357b7191e5fae97f61bf8dcc4510b902b44864e0b2714181a9762093afae14",
-                    "mixHash" : "0x91373e3f49488bc0d81abcddbf0495c10ee02278d238ed303cf9d907c7427019",
-                    "nonce" : "0xb37dfb49bb034d37",
+                    "hash" : "0xc32bcea46846c4339fff7bf64ce0c3a5a0d8ad71887792be72e920f22bdd73fc",
+                    "mixHash" : "0x49599cc0ab5ebbf26e5f6773682cec4556d374700e49b1c4b7848de6e7103914",
+                    "nonce" : "0x9ce5e0840bbbef0d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091373e3f49488bc0d81abcddbf0495c10ee02278d238ed303cf9d907c742701988b37dfb49bb034d37f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a049599cc0ab5ebbf26e5f6773682cec4556d374700e49b1c4b7848de6e7103914889ce5e0840bbbef0df85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c357b7191e5fae97f61bf8dcc4510b902b44864e0b2714181a9762093afae14",
+        "lastblockhash" : "0xc32bcea46846c4339fff7bf64ce0c3a5a0d8ad71887792be72e920f22bdd73fc",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d44g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d44g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc9304ee2034db5f188590e7a2fe8127d6ce74647f3bc83ad5859d8b6e5e40e3c",
-                    "mixHash" : "0x719dc433e4362756a31cf32b281a90794b3b299f198534afcd43591a6148f9f2",
-                    "nonce" : "0xf012cf063cffed91",
+                    "hash" : "0xdabb27781178149a7947970e4ef6ee86a50845adec66529fb70156af8b0639c7",
+                    "mixHash" : "0x4bf6c3cc9ed99753cb92fd19e9643091ccf647f9ad3c736c902241e44c95a580",
+                    "nonce" : "0x6458ad4a1cbfc194",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xf4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0719dc433e4362756a31cf32b281a90794b3b299f198534afcd43591a6148f9f288f012cf063cffed91f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f4338e754b8651954b5384055da5ee6932fadf0d7c5db7cae2f5d509dcdce921a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04bf6c3cc9ed99753cb92fd19e9643091ccf647f9ad3c736c902241e44c95a580886458ad4a1cbfc194f85ff85d800183061a8080830186a08e6001600160016001a960006000f31ba009279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167a03c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001a960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9304ee2034db5f188590e7a2fe8127d6ce74647f3bc83ad5859d8b6e5e40e3c",
+        "lastblockhash" : "0xdabb27781178149a7947970e4ef6ee86a50845adec66529fb70156af8b0639c7",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0.json
index 1b9e27661..23f42bcd3 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d45g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5033b60a45c6b3685c0ae0f1bac105b42947975474902581a218ef3e5b967b94",
-                    "mixHash" : "0xbc7316c4efe097afd2f7890e40a1fc42135f510f74a0a3b6498be31622c4bab9",
-                    "nonce" : "0xbc73afc7a1de4a8e",
+                    "hash" : "0x154cc1526ecba5cf8a56ab2807487de9b8c112129cddbd642212bda0334bd46a",
+                    "mixHash" : "0xc3d126da6396c09fbe674dd6c441d6dd42d6a79efef818d174365c2625f01cd5",
+                    "nonce" : "0xd3aac3d5b22d5a20",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bc7316c4efe097afd2f7890e40a1fc42135f510f74a0a3b6498be31622c4bab988bc73afc7a1de4a8ef85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c3d126da6396c09fbe674dd6c441d6dd42d6a79efef818d174365c2625f01cd588d3aac3d5b22d5a20f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5033b60a45c6b3685c0ae0f1bac105b42947975474902581a218ef3e5b967b94",
+        "lastblockhash" : "0x154cc1526ecba5cf8a56ab2807487de9b8c112129cddbd642212bda0334bd46a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d45g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x303d2571e521a327695892201ea84f64169e568f0171ce1d04129d70b07a5df0",
-                    "mixHash" : "0x54251c59fbf34be38a8f6f5fa32dbce739311d91ffb67e55f1141f2a47e5f852",
-                    "nonce" : "0xcb78bc01a647ba0c",
+                    "hash" : "0xc94224029df0f5f220a529c211aa652a5aea4eca49786f84ea92e4f52d8a6392",
+                    "mixHash" : "0xa74a42787fc75703eee8e1f21e4bf05b5f7c6292cec772aa3b999521ab9faa5c",
+                    "nonce" : "0x04d73f8609560257",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a054251c59fbf34be38a8f6f5fa32dbce739311d91ffb67e55f1141f2a47e5f85288cb78bc01a647ba0cf85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a74a42787fc75703eee8e1f21e4bf05b5f7c6292cec772aa3b999521ab9faa5c8804d73f8609560257f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x303d2571e521a327695892201ea84f64169e568f0171ce1d04129d70b07a5df0",
+        "lastblockhash" : "0xc94224029df0f5f220a529c211aa652a5aea4eca49786f84ea92e4f52d8a6392",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d45g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x815d75bc957fa27a0b9634ac06b57cbbd523a7fffadc27eefb4f0752129d0065",
-                    "mixHash" : "0x6cc28893b0ef8e7d933957e6af6947aa16cd2fcf4936e25c9559b5a89d5ca0c1",
-                    "nonce" : "0x2eb65e2f70f7b58a",
+                    "hash" : "0x571925fb411701e761d8c3e44806c66325c990c7ce36878ba346978ce0c55ee1",
+                    "mixHash" : "0xa4f4b93259288da46253aca9aa30044b29ff8828142f54a23a0ce328f1f42ebd",
+                    "nonce" : "0xc7d8a1f91d68886c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06cc28893b0ef8e7d933957e6af6947aa16cd2fcf4936e25c9559b5a89d5ca0c1882eb65e2f70f7b58af85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4f4b93259288da46253aca9aa30044b29ff8828142f54a23a0ce328f1f42ebd88c7d8a1f91d68886cf85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x815d75bc957fa27a0b9634ac06b57cbbd523a7fffadc27eefb4f0752129d0065",
+        "lastblockhash" : "0x571925fb411701e761d8c3e44806c66325c990c7ce36878ba346978ce0c55ee1",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d45g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x308312653ae0ae85ab30836f53295b34d44f920b6eb782cbdd7be7fbeb1ea20f",
-                    "mixHash" : "0x34ef60a48885689219836be44586935a2bc6c08c884075500401935e5fdb4e8c",
-                    "nonce" : "0x5c146223d9b3adc8",
+                    "hash" : "0x676fb71e4f827a9924e9499ba113a27cd0e7603d7fed26e4d48043dbe0da1aae",
+                    "mixHash" : "0x43155a3e343aca490555242b6eb5e78aae0a3dcdb24530e5186e96e264371eb1",
+                    "nonce" : "0xa5ac4e497271b16b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a034ef60a48885689219836be44586935a2bc6c08c884075500401935e5fdb4e8c885c146223d9b3adc8f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043155a3e343aca490555242b6eb5e78aae0a3dcdb24530e5186e96e264371eb188a5ac4e497271b16bf85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x308312653ae0ae85ab30836f53295b34d44f920b6eb782cbdd7be7fbeb1ea20f",
+        "lastblockhash" : "0x676fb71e4f827a9924e9499ba113a27cd0e7603d7fed26e4d48043dbe0da1aae",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d45g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6400228b5d4c723561823db87fa2ca3af18cc36e367efe93100da050d7e60d91",
-                    "mixHash" : "0xd86f2288ce7903d472bf3851bea25f168b52781aec445c7a994fae4bc37ab713",
-                    "nonce" : "0xcd0cb40d99957327",
+                    "hash" : "0xe48545e9a00d3432adf99100f96a3819437afc50c2ba7613a1d31b99dfa6a883",
+                    "mixHash" : "0xd80dbac0dafb8fb3915c92d0e8cb2d0bb6d53000f74213373775826644653229",
+                    "nonce" : "0x8b47abb9ce56fb06",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d86f2288ce7903d472bf3851bea25f168b52781aec445c7a994fae4bc37ab71388cd0cb40d99957327f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d80dbac0dafb8fb3915c92d0e8cb2d0bb6d53000f74213373775826644653229888b47abb9ce56fb06f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6400228b5d4c723561823db87fa2ca3af18cc36e367efe93100da050d7e60d91",
+        "lastblockhash" : "0xe48545e9a00d3432adf99100f96a3819437afc50c2ba7613a1d31b99dfa6a883",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d45g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d45g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b2eda3f366740e8d7e20ea0726888a246b9a5ff182bb87e3a864755cbd66ab6",
-                    "mixHash" : "0xe2a52f54c1130ea1b39b9a8c604a1e65576c08e851c1a06364505d6c0ccc0db0",
-                    "nonce" : "0x780936da58b597fe",
+                    "hash" : "0x8e2149ca69cfaa346aa1e41e59cdaf7c23fa6102db3059b3d5c723665664e604",
+                    "mixHash" : "0xa73225a33af77254b12a3a685fdbc4d91cc6b462094fd27e33635f86b8f1b607",
+                    "nonce" : "0x61d219fdfced51d0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xe85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e2a52f54c1130ea1b39b9a8c604a1e65576c08e851c1a06364505d6c0ccc0db088780936da58b597fef85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e85e7ea10b44077e3a0e0064f5dda7ca8e22f73dba6434e31270ef1c61386578a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a73225a33af77254b12a3a685fdbc4d91cc6b462094fd27e33635f86b8f1b6078861d219fdfced51d0f85ff85d800183061a8080830186a08e6001600160016001aa60006000f31ca0c60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56a076a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001aa60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b2eda3f366740e8d7e20ea0726888a246b9a5ff182bb87e3a864755cbd66ab6",
+        "lastblockhash" : "0x8e2149ca69cfaa346aa1e41e59cdaf7c23fa6102db3059b3d5c723665664e604",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0.json
index 6c6145848..1d4ea5f82 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d46g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe618822d9d195f35871efe512c5e43d58c7a64b8ba1093592686d5e8f2560da8",
-                    "mixHash" : "0x2e45c535ffe00b45f5e0c1d53d80bd159bfedf72e12c205949009cb97a56bfaf",
-                    "nonce" : "0xe70ebdbd82beea45",
+                    "hash" : "0xaf0a88e46ec8eb8a73286a6bb0e62cae8b5f0f8cc983b469693a345b2b0e28b7",
+                    "mixHash" : "0xad737d7b7375bd7de992ca30f2437e74fdcf3bf5d58b94008492409a000e9cbf",
+                    "nonce" : "0xf78143eccacdf523",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02e45c535ffe00b45f5e0c1d53d80bd159bfedf72e12c205949009cb97a56bfaf88e70ebdbd82beea45f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ad737d7b7375bd7de992ca30f2437e74fdcf3bf5d58b94008492409a000e9cbf88f78143eccacdf523f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe618822d9d195f35871efe512c5e43d58c7a64b8ba1093592686d5e8f2560da8",
+        "lastblockhash" : "0xaf0a88e46ec8eb8a73286a6bb0e62cae8b5f0f8cc983b469693a345b2b0e28b7",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d46g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8ae5bac418889e788c5e0293125ee2fc7085cba560ff69d959e015bb73e981ee",
-                    "mixHash" : "0x285e186bed7a363a5d3d5973521c4cf41778c2d6b5a7ec1f03a9f6fe88104450",
-                    "nonce" : "0x0acdda3632d359f3",
+                    "hash" : "0x4cc41c92485a870b8e9d737ab996b8a07f294a9092d8ca5cbefecf6d1fe49bc1",
+                    "mixHash" : "0x4bf018dad1991a1f80e1700881601a0a8b390ae8735564c83417e11d4f8e2632",
+                    "nonce" : "0x8d7ddc80c082341f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0285e186bed7a363a5d3d5973521c4cf41778c2d6b5a7ec1f03a9f6fe88104450880acdda3632d359f3f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04bf018dad1991a1f80e1700881601a0a8b390ae8735564c83417e11d4f8e2632888d7ddc80c082341ff85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ae5bac418889e788c5e0293125ee2fc7085cba560ff69d959e015bb73e981ee",
+        "lastblockhash" : "0x4cc41c92485a870b8e9d737ab996b8a07f294a9092d8ca5cbefecf6d1fe49bc1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d46g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x474befa48426698b0125b7b147501932311e4c65d40bd31d8d82cd07d02a95b1",
-                    "mixHash" : "0x573616b233b3616b9569a3f43c90cd9e3520d9b5b58fcb181356f7298c1914d0",
-                    "nonce" : "0x74c2a46268b20abb",
+                    "hash" : "0xcde4ac751bbf1dda3092d56ae9046a379dc45b87cebe2193cdfbd4a500ba82b0",
+                    "mixHash" : "0x479dfa90d4d054ef3fb33f2c3a6a9d8ba60aff95b5b3b4ae6105d06e699f5628",
+                    "nonce" : "0x7ed6dd8496dda6ee",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0573616b233b3616b9569a3f43c90cd9e3520d9b5b58fcb181356f7298c1914d08874c2a46268b20abbf85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0479dfa90d4d054ef3fb33f2c3a6a9d8ba60aff95b5b3b4ae6105d06e699f5628887ed6dd8496dda6eef85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x474befa48426698b0125b7b147501932311e4c65d40bd31d8d82cd07d02a95b1",
+        "lastblockhash" : "0xcde4ac751bbf1dda3092d56ae9046a379dc45b87cebe2193cdfbd4a500ba82b0",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d46g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xee46918f55e7d0fd88aa2feeec52e01cc54a4b9ab9627c254eefebea1d890e92",
-                    "mixHash" : "0x47cf614d2ba2abdb6d29b683a96edb1ab6559f6c0bda4b39a3cb024123c6db85",
-                    "nonce" : "0x684bc42a7b677788",
+                    "hash" : "0x54a93b9fb392facccfd0aff6ee8e44e8c0988a738e6a45c6d4f1510e4e981288",
+                    "mixHash" : "0x6ecbcd401fe9eeff0dc850036adcfb48e4a426557b533d1e1911816adc4e205e",
+                    "nonce" : "0xc424eab9f345f8f7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a047cf614d2ba2abdb6d29b683a96edb1ab6559f6c0bda4b39a3cb024123c6db8588684bc42a7b677788f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ecbcd401fe9eeff0dc850036adcfb48e4a426557b533d1e1911816adc4e205e88c424eab9f345f8f7f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee46918f55e7d0fd88aa2feeec52e01cc54a4b9ab9627c254eefebea1d890e92",
+        "lastblockhash" : "0x54a93b9fb392facccfd0aff6ee8e44e8c0988a738e6a45c6d4f1510e4e981288",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d46g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc64cfed4ec9e7ba4f47d481002c0611ae165d0f4f8c32af404565a4604831de2",
-                    "mixHash" : "0xc59ae44f12217637d3889ca0ddb04c1d6bfb80280e0a056fba52299cdcf46345",
-                    "nonce" : "0x33f6f93f2c22433b",
+                    "hash" : "0xa32ac41e19262a59a24b8c02865d5b6c6a88c53f14e0044c9e7b0f7b695d5f8e",
+                    "mixHash" : "0xe42ef8cb5ea140e4aaf54a75d731682b7a6422c1c2059220c0a6e9ea580bb9c5",
+                    "nonce" : "0xd2bfe2d710d69a31",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c59ae44f12217637d3889ca0ddb04c1d6bfb80280e0a056fba52299cdcf463458833f6f93f2c22433bf85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e42ef8cb5ea140e4aaf54a75d731682b7a6422c1c2059220c0a6e9ea580bb9c588d2bfe2d710d69a31f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc64cfed4ec9e7ba4f47d481002c0611ae165d0f4f8c32af404565a4604831de2",
+        "lastblockhash" : "0xa32ac41e19262a59a24b8c02865d5b6c6a88c53f14e0044c9e7b0f7b695d5f8e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d46g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d46g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7ae1fdbac062591e5d1382d5856931a8c2e8152d467a3891d45901b8d7469059",
-                    "mixHash" : "0x17686d8012cf1a9863d9d7ce95a3f8a80d882d327981f2da11c2ae736288033a",
-                    "nonce" : "0x5271fbcc133bcb55",
+                    "hash" : "0x2ea2490eaaf0a2bf16118667905c838974c828d696c73c1269219f078d2feedb",
+                    "mixHash" : "0x4b555f2450a062ee7bf720267e597652c3da868b1feafa6e300cafc43dcec45a",
+                    "nonce" : "0xd13c5febe88a299c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017686d8012cf1a9863d9d7ce95a3f8a80d882d327981f2da11c2ae736288033a885271fbcc133bcb55f85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0579312424e3db9e84dceeeaf926cbe96fb454052226be039581986d533300d5fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04b555f2450a062ee7bf720267e597652c3da868b1feafa6e300cafc43dcec45a88d13c5febe88a299cf85ff85d800183061a8080830186a08e6001600160016001ab60006000f31ba011f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109a0655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ab60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ae1fdbac062591e5d1382d5856931a8c2e8152d467a3891d45901b8d7469059",
+        "lastblockhash" : "0x2ea2490eaaf0a2bf16118667905c838974c828d696c73c1269219f078d2feedb",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0.json
index b2c0235a9..062f81eec 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d47g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6881ffe35d57e3e5fd7deeb1a3cb2c1be199663866dead605a5d69b55829274f",
-                    "mixHash" : "0x606da75e5baaaf4e3ad088137fa911d385b000ef10a75aef4e3af2dbd1214b83",
-                    "nonce" : "0xe7573157fb5bf18f",
+                    "hash" : "0x878af47b2addc39c923bc705f13a785b15ee9da93b0f244c5bd72a8e09120855",
+                    "mixHash" : "0x01909add04fe5b01072ca4089a9ec3daa541928e0540b7a9034f06ac3fcb8a63",
+                    "nonce" : "0xdc30192de08fdb3a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0606da75e5baaaf4e3ad088137fa911d385b000ef10a75aef4e3af2dbd1214b8388e7573157fb5bf18ff85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a001909add04fe5b01072ca4089a9ec3daa541928e0540b7a9034f06ac3fcb8a6388dc30192de08fdb3af85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6881ffe35d57e3e5fd7deeb1a3cb2c1be199663866dead605a5d69b55829274f",
+        "lastblockhash" : "0x878af47b2addc39c923bc705f13a785b15ee9da93b0f244c5bd72a8e09120855",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d47g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd6bbefd0ab8cd13ca52a7fab8f9a2de9ee8c2134f45e41291387a869647f4d29",
-                    "mixHash" : "0x7f709663ac0d72e9a75e3fb78c2b8f74702d73925e766519a1dde34c32187b3b",
-                    "nonce" : "0x4eb79a0edd575e46",
+                    "hash" : "0xd321ed88926c2ee7ddc6128fc9210d54a241f472c21d0afc3019535526212837",
+                    "mixHash" : "0x8853669d4e4026283cbe384e5303af6713ddc8ed7777fdefd498c046b93f0407",
+                    "nonce" : "0x7dae728386293972",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f709663ac0d72e9a75e3fb78c2b8f74702d73925e766519a1dde34c32187b3b884eb79a0edd575e46f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08853669d4e4026283cbe384e5303af6713ddc8ed7777fdefd498c046b93f0407887dae728386293972f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6bbefd0ab8cd13ca52a7fab8f9a2de9ee8c2134f45e41291387a869647f4d29",
+        "lastblockhash" : "0xd321ed88926c2ee7ddc6128fc9210d54a241f472c21d0afc3019535526212837",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d47g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf9bfe203c49e9ff38e0d5798af8a8f60e43edbf7eb5694244c3b912b1004965c",
-                    "mixHash" : "0x648ea90381893d0c99382027f076d5e785c08d6c7c08ed269196240e25e85a4c",
-                    "nonce" : "0x9fb5842ec2dc02ba",
+                    "hash" : "0x8890e38167cd9e94d29c77245ed8b7038e151899a94d747218343613c5bdc6f4",
+                    "mixHash" : "0x56ee0de8227217e6a5e41c9b96378443036c6e21bf3192dcb33644021f4ac160",
+                    "nonce" : "0x5a0476b560fa3ae1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0648ea90381893d0c99382027f076d5e785c08d6c7c08ed269196240e25e85a4c889fb5842ec2dc02baf85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a056ee0de8227217e6a5e41c9b96378443036c6e21bf3192dcb33644021f4ac160885a0476b560fa3ae1f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9bfe203c49e9ff38e0d5798af8a8f60e43edbf7eb5694244c3b912b1004965c",
+        "lastblockhash" : "0x8890e38167cd9e94d29c77245ed8b7038e151899a94d747218343613c5bdc6f4",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d47g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1c9621d985140d99c49af3d588a8daa1fa4ee69af29543fd624ed931c7792220",
-                    "mixHash" : "0x992c8ea0bc74f23973df2a580e93fa00e3fb5aabefefd43535b00a2487dc5c05",
-                    "nonce" : "0x4a62b173ea975b9c",
+                    "hash" : "0xfe091ac5c346076f1f28f4a26ccdafdd6d1919f29e7c8c3955d826c73813f75d",
+                    "mixHash" : "0xa9e636fbb76e1ae796a9d2a5e3ab6037b6b9ce113c10ac7637cece08aed7daa8",
+                    "nonce" : "0x14ea47dbc7d31930",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0992c8ea0bc74f23973df2a580e93fa00e3fb5aabefefd43535b00a2487dc5c05884a62b173ea975b9cf85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a9e636fbb76e1ae796a9d2a5e3ab6037b6b9ce113c10ac7637cece08aed7daa88814ea47dbc7d31930f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c9621d985140d99c49af3d588a8daa1fa4ee69af29543fd624ed931c7792220",
+        "lastblockhash" : "0xfe091ac5c346076f1f28f4a26ccdafdd6d1919f29e7c8c3955d826c73813f75d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d47g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x54a7562131b6860c2b218d5146cecdddeddc2460aea23043042b924eb15b6d89",
-                    "mixHash" : "0x99d786b3c562079c04c91cc5f8d06cd2d1b9fa7050f6af14986b4057707a64dc",
-                    "nonce" : "0x2214addca14139c0",
+                    "hash" : "0x9845112fb622cc698673c217e3e85b3ccf83d45520f955752615a2b5a96e67c9",
+                    "mixHash" : "0x260e300df4b5034c03022ff6fb742d5df047a88dbe2bd129fcec08366732419a",
+                    "nonce" : "0xf9674c9dee6a377d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a099d786b3c562079c04c91cc5f8d06cd2d1b9fa7050f6af14986b4057707a64dc882214addca14139c0f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0260e300df4b5034c03022ff6fb742d5df047a88dbe2bd129fcec08366732419a88f9674c9dee6a377df85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54a7562131b6860c2b218d5146cecdddeddc2460aea23043042b924eb15b6d89",
+        "lastblockhash" : "0x9845112fb622cc698673c217e3e85b3ccf83d45520f955752615a2b5a96e67c9",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d47g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d47g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x02bff9c10c2652ac576774a650e5d0573061f181a1cdab69f51fcf5b25fb7285",
-                    "mixHash" : "0xd0164899bd1a84545244b465fee8cfa5031cd63d7b549651b7049cc45df65932",
-                    "nonce" : "0xf245eea6066d40e5",
+                    "hash" : "0xf01352384572c682db0dc73fa2a007729ac41717a9039c5688cba0026fbf4754",
+                    "mixHash" : "0xfa71dba1ad122258da19e632778413bda52feff91ff35a7c452b0a9e4c3c8d3e",
+                    "nonce" : "0x95106c2d69ab0e07",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xd1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d0164899bd1a84545244b465fee8cfa5031cd63d7b549651b7049cc45df6593288f245eea6066d40e5f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d1bedbf6fec0cf09e75caa4e2e1fae2f9d6e4ff9daabeef562e920988d6bf36ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fa71dba1ad122258da19e632778413bda52feff91ff35a7c452b0a9e4c3c8d3e8895106c2d69ab0e07f85ff85d800183061a8080830186a08e6001600160016001ac60006000f31ba0afe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821aa00ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ac60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02bff9c10c2652ac576774a650e5d0573061f181a1cdab69f51fcf5b25fb7285",
+        "lastblockhash" : "0xf01352384572c682db0dc73fa2a007729ac41717a9039c5688cba0026fbf4754",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0.json
index 6b330a9d8..ccdd8a74c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d48g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2a6ffc9b09dc1ad46a6688c488399dcbbd0eb425c1add80d6b73d810f604a831",
-                    "mixHash" : "0x4d3186d1fc7f5121e6b9aa9f407b6d2f6600097a1b296aee9e017191a190cca7",
-                    "nonce" : "0x15bfa282c6b03d18",
+                    "hash" : "0x62617bb82c2e8f36cde2e7ae1034efc15615f9822001188cbdfda452c0770663",
+                    "mixHash" : "0xe6604b4f1475bb94295336d172838a54c8b1b4c1285351346fc4e7fadbb7b33f",
+                    "nonce" : "0x865b377c48489369",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04d3186d1fc7f5121e6b9aa9f407b6d2f6600097a1b296aee9e017191a190cca78815bfa282c6b03d18f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e6604b4f1475bb94295336d172838a54c8b1b4c1285351346fc4e7fadbb7b33f88865b377c48489369f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a6ffc9b09dc1ad46a6688c488399dcbbd0eb425c1add80d6b73d810f604a831",
+        "lastblockhash" : "0x62617bb82c2e8f36cde2e7ae1034efc15615f9822001188cbdfda452c0770663",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d48g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5ac3b8b3c380ce976bc3b7e00af390b0546828c2129ccdb8f8e37d1ef44fa886",
-                    "mixHash" : "0x047b11f80ed7f35d6e08de72b53638c7dde0b87cf9e26eb0efef6afa87ce3e44",
-                    "nonce" : "0xde384aa265b72ec0",
+                    "hash" : "0x66d0096e1bc637c7a2daa7e506cbe26797954ef27d00f4c8188a3453157cbf6f",
+                    "mixHash" : "0x5a6565c8cfa798c3008817d556f96b62a401a8d4fa531d855baff39be01c1a43",
+                    "nonce" : "0xaee089a093040c15",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0047b11f80ed7f35d6e08de72b53638c7dde0b87cf9e26eb0efef6afa87ce3e4488de384aa265b72ec0f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05a6565c8cfa798c3008817d556f96b62a401a8d4fa531d855baff39be01c1a4388aee089a093040c15f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ac3b8b3c380ce976bc3b7e00af390b0546828c2129ccdb8f8e37d1ef44fa886",
+        "lastblockhash" : "0x66d0096e1bc637c7a2daa7e506cbe26797954ef27d00f4c8188a3453157cbf6f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d48g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3ab32a6cc16503a31d933a4f7649d91ab01a89afbbcda959f3f34568bb068dbc",
-                    "mixHash" : "0x7f513b2dc3a60c62d119ea9241c23a10b11eb87deb398c198eb5ff669b1b7e8c",
-                    "nonce" : "0x121cfd35b31ce8de",
+                    "hash" : "0x17c234a3fd3ebdc22346b0d5e02a9343b0790921bc5357e55b2139280e0d13dd",
+                    "mixHash" : "0x402803c16a452d11e789cebf63888277b190a62b51cfef0e6b7b358ad91c0058",
+                    "nonce" : "0x039cb5a9e554df85",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f513b2dc3a60c62d119ea9241c23a10b11eb87deb398c198eb5ff669b1b7e8c88121cfd35b31ce8def85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0402803c16a452d11e789cebf63888277b190a62b51cfef0e6b7b358ad91c005888039cb5a9e554df85f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab32a6cc16503a31d933a4f7649d91ab01a89afbbcda959f3f34568bb068dbc",
+        "lastblockhash" : "0x17c234a3fd3ebdc22346b0d5e02a9343b0790921bc5357e55b2139280e0d13dd",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d48g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x45e16bc1d6197aca9d2097de47df82bbafc79fd51610261cc3201c2a17754d11",
-                    "mixHash" : "0x2975cd85be47089605b1406a8d4f82c770b43ba09a83f24a93b776189408ed66",
-                    "nonce" : "0x5cad257360f371a6",
+                    "hash" : "0x86cb82e882f367997d6ac4092e580717592355338e98fff50d3c9bc00117b65c",
+                    "mixHash" : "0x4706579e9cabcd209cd42c88e1b111ed3fd75c4fe5a2f8f531630a665e4c807c",
+                    "nonce" : "0x5ff1acaa36e26c41",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02975cd85be47089605b1406a8d4f82c770b43ba09a83f24a93b776189408ed66885cad257360f371a6f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04706579e9cabcd209cd42c88e1b111ed3fd75c4fe5a2f8f531630a665e4c807c885ff1acaa36e26c41f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45e16bc1d6197aca9d2097de47df82bbafc79fd51610261cc3201c2a17754d11",
+        "lastblockhash" : "0x86cb82e882f367997d6ac4092e580717592355338e98fff50d3c9bc00117b65c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d48g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3ffd75b46b31b70a889cd5b1e315731fa9e5c1db0ade47642bc5ca6ed55b4ff7",
-                    "mixHash" : "0xd8d67ff901e3df6b82d541b02f7009876f96dacc1fff35e0c8742ab828e6d1f7",
-                    "nonce" : "0xfc660c00787a4d0a",
+                    "hash" : "0x3f6ba885ae85ffd85505c5a7f426cae71df30dbff7af2bda28377efe96fb385a",
+                    "mixHash" : "0xbfc37f9f7b2a14d3b3fbb06ab6ca7f3345ea70eac140fde6c309db1b7dd1218b",
+                    "nonce" : "0x7ba72990b9c6b1ff",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d8d67ff901e3df6b82d541b02f7009876f96dacc1fff35e0c8742ab828e6d1f788fc660c00787a4d0af85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bfc37f9f7b2a14d3b3fbb06ab6ca7f3345ea70eac140fde6c309db1b7dd1218b887ba72990b9c6b1fff85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ffd75b46b31b70a889cd5b1e315731fa9e5c1db0ade47642bc5ca6ed55b4ff7",
+        "lastblockhash" : "0x3f6ba885ae85ffd85505c5a7f426cae71df30dbff7af2bda28377efe96fb385a",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d48g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d48g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe1628a3b2edd5aa6164e5cda19f329ed20f5a729e040683403c732b098e7c907",
-                    "mixHash" : "0xa9a51a774a628a83b9e99ab255cfeb6674057253f0552a42ac4e272237a3a44b",
-                    "nonce" : "0x9a6c027babf0fbd5",
+                    "hash" : "0xae8aab5af8aed34ede7d5b9fadb76ff4f5a4574ac1f46bf90ae80de714400a84",
+                    "mixHash" : "0x1cfd4d869bcd9deba2f3b8088af04c919297eca5afdeadeb3a02240a1a03f656",
+                    "nonce" : "0xa8112f90bbb0e028",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x94243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a9a51a774a628a83b9e99ab255cfeb6674057253f0552a42ac4e272237a3a44b889a6c027babf0fbd5f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea094243f05604178b633584796de8a63c3e7bd92af8a183983ba5154e8aaf0d382a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01cfd4d869bcd9deba2f3b8088af04c919297eca5afdeadeb3a02240a1a03f65688a8112f90bbb0e028f85ff85d800183061a8080830186a08e6001600160016001ad60006000f31ba00975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34a020263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ad60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1628a3b2edd5aa6164e5cda19f329ed20f5a729e040683403c732b098e7c907",
+        "lastblockhash" : "0xae8aab5af8aed34ede7d5b9fadb76ff4f5a4574ac1f46bf90ae80de714400a84",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0.json
index 6dc624eec..e33a7b2c7 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d49g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xaa3293a6dfebd351429495d7015bd000baa00c536ae35c25a1db6c89f504b933",
-                    "mixHash" : "0xf3bc9b2b2941ac50d672550db373a692a065423944b9f7ac79ac6f21294a7558",
-                    "nonce" : "0xf693129214a0280d",
+                    "hash" : "0x69675c491ac0a7376f033c103af153eda96a09141c572f691707e0b8dbe5d2c1",
+                    "mixHash" : "0xecb9d3811d696b723b8e1994b1b24a03e60e12de483d73cdd059171a01e56f41",
+                    "nonce" : "0x652324c87a8caba6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f3bc9b2b2941ac50d672550db373a692a065423944b9f7ac79ac6f21294a755888f693129214a0280df85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ecb9d3811d696b723b8e1994b1b24a03e60e12de483d73cdd059171a01e56f4188652324c87a8caba6f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa3293a6dfebd351429495d7015bd000baa00c536ae35c25a1db6c89f504b933",
+        "lastblockhash" : "0x69675c491ac0a7376f033c103af153eda96a09141c572f691707e0b8dbe5d2c1",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d49g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x830932414b4e699c2d565d0f8ecaea44e7a1377b7bd9ef4c3185f3d41e88a572",
-                    "mixHash" : "0xce91a89c38462ca1632e21ce3195a6c1a1425b2ebafdcff3e933ff0df1d5ae20",
-                    "nonce" : "0xe5cd7ad0439d9dd6",
+                    "hash" : "0x96a9ecb0c6458a280a9d6c15a94f03912afc66ca727e9f87f230ca26bc7bfa6c",
+                    "mixHash" : "0x8dfa6e5d44606b78bc607bfbba086f9bb317199414a72d1c89f162f3477148fe",
+                    "nonce" : "0x60b53f3e0c49a5f9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ce91a89c38462ca1632e21ce3195a6c1a1425b2ebafdcff3e933ff0df1d5ae2088e5cd7ad0439d9dd6f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08dfa6e5d44606b78bc607bfbba086f9bb317199414a72d1c89f162f3477148fe8860b53f3e0c49a5f9f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x830932414b4e699c2d565d0f8ecaea44e7a1377b7bd9ef4c3185f3d41e88a572",
+        "lastblockhash" : "0x96a9ecb0c6458a280a9d6c15a94f03912afc66ca727e9f87f230ca26bc7bfa6c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d49g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf8fa5a8117a322bf6b343d6ff732fa6106a0d039c45b40b25de10b1dd266097f",
-                    "mixHash" : "0xe74131374c6e91209cc7b987f65f806c5bc9b87d5a29a6f18bddbbc6bbde7c34",
-                    "nonce" : "0x44fb717adac8c4c8",
+                    "hash" : "0x42f47101bd2ea2c18edc1a2fdda60ada4f49e77cfedb599b10a37a919a7351a7",
+                    "mixHash" : "0xe3801b7d80d11182a568e4c1d6f544c57dd2ae4de017ef9bb4bd9e7398944a35",
+                    "nonce" : "0x6585527428b5b6d0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e74131374c6e91209cc7b987f65f806c5bc9b87d5a29a6f18bddbbc6bbde7c348844fb717adac8c4c8f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e3801b7d80d11182a568e4c1d6f544c57dd2ae4de017ef9bb4bd9e7398944a35886585527428b5b6d0f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8fa5a8117a322bf6b343d6ff732fa6106a0d039c45b40b25de10b1dd266097f",
+        "lastblockhash" : "0x42f47101bd2ea2c18edc1a2fdda60ada4f49e77cfedb599b10a37a919a7351a7",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d49g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x014bbcc2e4ede1ac48096fd0e086c5b96fbe543a7a173e53ca52d31e59dddeca",
-                    "mixHash" : "0x14b9f3d8a4f0dad362eeca3ddf52d16f635ad6db5febc4a3cc3d4a0185a86fdb",
-                    "nonce" : "0x7727fddc78c650b6",
+                    "hash" : "0x03e0df646e7d147061c2406badc59aebdaf5db7e7e34b0252a404632046bc913",
+                    "mixHash" : "0xd1f9e3670cf9d6d134def5e369242e81cde50aeac3c4e002b8a033f8bc4afed7",
+                    "nonce" : "0x8b6970e4313055ed",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a014b9f3d8a4f0dad362eeca3ddf52d16f635ad6db5febc4a3cc3d4a0185a86fdb887727fddc78c650b6f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d1f9e3670cf9d6d134def5e369242e81cde50aeac3c4e002b8a033f8bc4afed7888b6970e4313055edf85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x014bbcc2e4ede1ac48096fd0e086c5b96fbe543a7a173e53ca52d31e59dddeca",
+        "lastblockhash" : "0x03e0df646e7d147061c2406badc59aebdaf5db7e7e34b0252a404632046bc913",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d49g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe40a39889290dfaa8cbbaf1953305a842f241e6d3bdd9f48a554374f353b7a62",
-                    "mixHash" : "0xc32a046ebb62841ec9ab751103cd558446264571b6b923309779f5ec7a19e3fc",
-                    "nonce" : "0xde302e2036dcfe3a",
+                    "hash" : "0x55bc88c31f89aa87f5d54730a76e2e163ad843f40b5a78651a33738abf17841f",
+                    "mixHash" : "0x69e769a3def403cfd817a76c09d27c7f01094d32c4fef8bdc6e51b5b4f41616c",
+                    "nonce" : "0xd23f7a06348a07fe",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c32a046ebb62841ec9ab751103cd558446264571b6b923309779f5ec7a19e3fc88de302e2036dcfe3af85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a069e769a3def403cfd817a76c09d27c7f01094d32c4fef8bdc6e51b5b4f41616c88d23f7a06348a07fef85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe40a39889290dfaa8cbbaf1953305a842f241e6d3bdd9f48a554374f353b7a62",
+        "lastblockhash" : "0x55bc88c31f89aa87f5d54730a76e2e163ad843f40b5a78651a33738abf17841f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d49g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d49g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7591898b761947ec55c6f4532ee55c126a16217aa2679eeec63f555ca1f5522a",
-                    "mixHash" : "0x73811647e619990650456c14638f53d046293f83b4cff708d80944f6721d069d",
-                    "nonce" : "0xa17f3af516b785cf",
+                    "hash" : "0xf6c3e0f609fe00c73b99c2d995a7d838c7dd9df328565d9b183930caf8211bb3",
+                    "mixHash" : "0x35e04d2e216785ebf64d8e20603b3c9ae10c4b75d6fd2d1add0547192d0e354b",
+                    "nonce" : "0x3713a0e50d316464",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xcb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a073811647e619990650456c14638f53d046293f83b4cff708d80944f6721d069d88a17f3af516b785cff85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cb449c299c3ea38098aa878e5599a25ae75f41465bb1bb58251100592d85f9a5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a035e04d2e216785ebf64d8e20603b3c9ae10c4b75d6fd2d1add0547192d0e354b883713a0e50d316464f85ff85d800183061a8080830186a08e6001600160016001ae60006000f31ba0a47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032ba03d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ae60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7591898b761947ec55c6f4532ee55c126a16217aa2679eeec63f555ca1f5522a",
+        "lastblockhash" : "0xf6c3e0f609fe00c73b99c2d995a7d838c7dd9df328565d9b183930caf8211bb3",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0.json
index 2b3c1a32d..d75c76cca 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d4g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbabf2735a6366a854a8d0b9f829e1d96c9483d96c3b032bf0625731deec5f2ed",
-                    "mixHash" : "0xe55b1ef9a843278c57d3792d5839f15984f5b346f5338ffb45bc6d7fc174f5f0",
-                    "nonce" : "0x236121d419b05228",
+                    "hash" : "0x51db07b9afed60996a114dc5eec43fe3bbb4d3539658ebee10a7807b1ec6d878",
+                    "mixHash" : "0x249fb3553457193b02ab8a284eee2eba536f30ce6caf627cb3374fe72e77c5b4",
+                    "nonce" : "0xe4c960f7d02ea053",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e55b1ef9a843278c57d3792d5839f15984f5b346f5338ffb45bc6d7fc174f5f088236121d419b05228f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0249fb3553457193b02ab8a284eee2eba536f30ce6caf627cb3374fe72e77c5b488e4c960f7d02ea053f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbabf2735a6366a854a8d0b9f829e1d96c9483d96c3b032bf0625731deec5f2ed",
+        "lastblockhash" : "0x51db07b9afed60996a114dc5eec43fe3bbb4d3539658ebee10a7807b1ec6d878",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d4g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x33ed213974a602d1a3818b4803863989fb084139b907a041a2b6d29fab59c980",
-                    "mixHash" : "0xd9d7fc37e22c6eb2af92027996ee099f56235f110245a1b3cd8fdeb013428cfc",
-                    "nonce" : "0x55667ae0306e8f33",
+                    "hash" : "0x2c0e4a06c056d230e930cba3de7688ab08d5a1bea01708ed3a05366f597635d5",
+                    "mixHash" : "0xd3d24e9bf15db0c66dab1b084082cf7e86d5b2e9110ae4377bcaf9cdcc1e2c2a",
+                    "nonce" : "0x8772975e59f7c7a4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d9d7fc37e22c6eb2af92027996ee099f56235f110245a1b3cd8fdeb013428cfc8855667ae0306e8f33f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3d24e9bf15db0c66dab1b084082cf7e86d5b2e9110ae4377bcaf9cdcc1e2c2a888772975e59f7c7a4f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33ed213974a602d1a3818b4803863989fb084139b907a041a2b6d29fab59c980",
+        "lastblockhash" : "0x2c0e4a06c056d230e930cba3de7688ab08d5a1bea01708ed3a05366f597635d5",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d4g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x179e8cb9757501ddcdd727b67265a5df93457f5f7860fbfbb079a46720331742",
-                    "mixHash" : "0xc68f68466e155104c7c6d382429803d2e42bb42319414de05d9a7e82cdd334ea",
-                    "nonce" : "0x93336d13a5c6479d",
+                    "hash" : "0x8d3f1f0be1ad4f9e5939a74818875060ebeed203d0f8c4cfae54399ac14279ba",
+                    "mixHash" : "0x6e674ec3366ac0edfd754ee1ec1719f165af7110a6bf04b59148d84fa2685de3",
+                    "nonce" : "0x8324fd76d34fd9e5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c68f68466e155104c7c6d382429803d2e42bb42319414de05d9a7e82cdd334ea8893336d13a5c6479df85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06e674ec3366ac0edfd754ee1ec1719f165af7110a6bf04b59148d84fa2685de3888324fd76d34fd9e5f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x179e8cb9757501ddcdd727b67265a5df93457f5f7860fbfbb079a46720331742",
+        "lastblockhash" : "0x8d3f1f0be1ad4f9e5939a74818875060ebeed203d0f8c4cfae54399ac14279ba",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d4g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x242177c42617aa5a9a8c6a2ffa1db00ee2ea1e0052ba7f78503bac22fd1a8345",
-                    "mixHash" : "0x96e2b924f32de0bcc519f17cf00929b20516c9fc299f0f54fd74e7aea383cf1d",
-                    "nonce" : "0x966804369a305409",
+                    "hash" : "0xd037060539dfa567d7c0e3c27adcee06c31a6fb45e561ccc825e71fc1a417bd2",
+                    "mixHash" : "0x281bf5eabd74ead05065e1c3041f5247c8c9c6ec6ee45bf24feead3d54b1331b",
+                    "nonce" : "0x4865c7f66400dad6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a096e2b924f32de0bcc519f17cf00929b20516c9fc299f0f54fd74e7aea383cf1d88966804369a305409f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0281bf5eabd74ead05065e1c3041f5247c8c9c6ec6ee45bf24feead3d54b1331b884865c7f66400dad6f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x242177c42617aa5a9a8c6a2ffa1db00ee2ea1e0052ba7f78503bac22fd1a8345",
+        "lastblockhash" : "0xd037060539dfa567d7c0e3c27adcee06c31a6fb45e561ccc825e71fc1a417bd2",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d4g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa4e5122920c663d55703438322c317518084c8801483ae60f80faecc5c325238",
-                    "mixHash" : "0xda097a7ba2a3e90d49790f676b42d39b8876307199900c9687238b1bc38feef2",
-                    "nonce" : "0x1bb4f5436136c257",
+                    "hash" : "0xc8d38ea13e4af2527d8c2e82f3f156cb4f060bdadfe73d6b226b110c84bfb075",
+                    "mixHash" : "0xfa157effae906bdd62d3b696189a24575f35af83a23c83684ecf82f640282948",
+                    "nonce" : "0xe1e1794c16f570a9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0da097a7ba2a3e90d49790f676b42d39b8876307199900c9687238b1bc38feef2881bb4f5436136c257f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fa157effae906bdd62d3b696189a24575f35af83a23c83684ecf82f64028294888e1e1794c16f570a9f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4e5122920c663d55703438322c317518084c8801483ae60f80faecc5c325238",
+        "lastblockhash" : "0xc8d38ea13e4af2527d8c2e82f3f156cb4f060bdadfe73d6b226b110c84bfb075",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d4g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d4g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5c4688043d74e4d099412db6c067ac8eec1f84de03917b9cbc487e570a571e87",
-                    "mixHash" : "0x7502e3350f1179d0fa245b4760acdea05b2710fbcf7898d327df0645322883e5",
-                    "nonce" : "0x8af8979f7add79f1",
+                    "hash" : "0xdd74ca0158ea47d87dc9e9281b5dbe959bebe3e620026fdb5791478be65f66dc",
+                    "mixHash" : "0xac280d5e51b7ddd928bc47808d5e5430fdeff5fceecf7eb597af2f59255d6a29",
+                    "nonce" : "0x18cb65a80d6dd804",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xda077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07502e3350f1179d0fa245b4760acdea05b2710fbcf7898d327df0645322883e5888af8979f7add79f1f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0da077e81f7796d7fd1665cf49e76d5c598b4b4743f6e8ea64906e520c564d60aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac280d5e51b7ddd928bc47808d5e5430fdeff5fceecf7eb597af2f59255d6a298818cb65a80d6dd804f85ff85d800183061a8080830186a08e60016001600160010f60006000f31ba0c93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5a06cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1ac0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160010f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c4688043d74e4d099412db6c067ac8eec1f84de03917b9cbc487e570a571e87",
+        "lastblockhash" : "0xdd74ca0158ea47d87dc9e9281b5dbe959bebe3e620026fdb5791478be65f66dc",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0.json
index 2d60e277a..683d93532 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d50g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcf2b656fc6410cc13d97674cfb74bd7ddf24582b2086e44c445cbb43e8daa935",
-                    "mixHash" : "0x78dec7655b20c00e044cb0600017e16328eeffbcd6e6185e9b587acee8135050",
-                    "nonce" : "0x3703470c4448a4a3",
+                    "hash" : "0xac2139db60c2d6bc1f5f5b141fe2c746c67da444489478ac193a760bc31c375c",
+                    "mixHash" : "0xdeb6488b1a3855f461d512bf49967cfcf8be5b0140b980144ca68b4d2b08454e",
+                    "nonce" : "0xc9092363d8e11066",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a078dec7655b20c00e044cb0600017e16328eeffbcd6e6185e9b587acee8135050883703470c4448a4a3f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0deb6488b1a3855f461d512bf49967cfcf8be5b0140b980144ca68b4d2b08454e88c9092363d8e11066f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf2b656fc6410cc13d97674cfb74bd7ddf24582b2086e44c445cbb43e8daa935",
+        "lastblockhash" : "0xac2139db60c2d6bc1f5f5b141fe2c746c67da444489478ac193a760bc31c375c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d50g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x38401d16b519af6718d50da2291825d50d7e535b04dc240a9b5d18ba6810f15c",
-                    "mixHash" : "0x4c7a6c6985cc990b94e623cee3e1dd9f11910c455a406a3597d92bd4477ff0ad",
-                    "nonce" : "0x95517ffe86449ede",
+                    "hash" : "0x76fc7eb699fe9bb6473b364032f0223fe20e992e35631e21e19e111a17f62298",
+                    "mixHash" : "0xea3c6fc30b4d9ae900d0161f1339b1a15496ea6720304c7815c8a96d18e563fb",
+                    "nonce" : "0x9e1ccbbc031a7920",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04c7a6c6985cc990b94e623cee3e1dd9f11910c455a406a3597d92bd4477ff0ad8895517ffe86449edef85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ea3c6fc30b4d9ae900d0161f1339b1a15496ea6720304c7815c8a96d18e563fb889e1ccbbc031a7920f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38401d16b519af6718d50da2291825d50d7e535b04dc240a9b5d18ba6810f15c",
+        "lastblockhash" : "0x76fc7eb699fe9bb6473b364032f0223fe20e992e35631e21e19e111a17f62298",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d50g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfceaa02a73686aea11961df094e55631a6c7eec495635b964126edffc45f9732",
-                    "mixHash" : "0x3b0f01e47be44c1254a6d0657b364a277fbec583afec3351d0f08907d06a9601",
-                    "nonce" : "0xc55883bf86922264",
+                    "hash" : "0x3f45cff09033d14fe5cf77989f57bb012fe24749e854993f71cdd21b17359b6b",
+                    "mixHash" : "0xbee68b14a6beeeac27fdee18b0891f2529809d62d7b89f70484435487229ce0c",
+                    "nonce" : "0xcfc6293894a3031b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03b0f01e47be44c1254a6d0657b364a277fbec583afec3351d0f08907d06a960188c55883bf86922264f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bee68b14a6beeeac27fdee18b0891f2529809d62d7b89f70484435487229ce0c88cfc6293894a3031bf85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfceaa02a73686aea11961df094e55631a6c7eec495635b964126edffc45f9732",
+        "lastblockhash" : "0x3f45cff09033d14fe5cf77989f57bb012fe24749e854993f71cdd21b17359b6b",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d50g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb33f96bd8fc2c7529156e5d46b1de2e055b8061116923760ded8e7f7f5eabb89",
-                    "mixHash" : "0x8f71cc0ef725c2ceafe590af93065361b607bd9bfa58b63c1dae9b1be26b87c3",
-                    "nonce" : "0xf865fbdeb5317241",
+                    "hash" : "0x24dba92a9e26c88c0d525bc6ef6fc1a0bf928f043aaea3d6f836f666d1febb44",
+                    "mixHash" : "0x1cb17de8b9cd9884e1a61f1fb51788528096285474baefd63f8cda0c3632dd76",
+                    "nonce" : "0xaa75b5c8f7b13462",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08f71cc0ef725c2ceafe590af93065361b607bd9bfa58b63c1dae9b1be26b87c388f865fbdeb5317241f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01cb17de8b9cd9884e1a61f1fb51788528096285474baefd63f8cda0c3632dd7688aa75b5c8f7b13462f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb33f96bd8fc2c7529156e5d46b1de2e055b8061116923760ded8e7f7f5eabb89",
+        "lastblockhash" : "0x24dba92a9e26c88c0d525bc6ef6fc1a0bf928f043aaea3d6f836f666d1febb44",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d50g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfb3a150316485a541d9e46c8031a2befb59dbfb6f7db8246efd78807b2d22c40",
-                    "mixHash" : "0xb60938eaab4e01093aa38d40b786bc5f13ee9e5a02c33622d601918598d6a898",
-                    "nonce" : "0x552fea2ca06c8f4c",
+                    "hash" : "0x602398db6dde6c981cf4bf33501e8b9b46ba17a9d01d6530615411e927550a9d",
+                    "mixHash" : "0xa0806a038b037c0e784c4c476b061bb452705a3ee962923378f463a2d8a0fd61",
+                    "nonce" : "0x6a3fa0630cd1a78d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b60938eaab4e01093aa38d40b786bc5f13ee9e5a02c33622d601918598d6a89888552fea2ca06c8f4cf85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a0806a038b037c0e784c4c476b061bb452705a3ee962923378f463a2d8a0fd61886a3fa0630cd1a78df85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb3a150316485a541d9e46c8031a2befb59dbfb6f7db8246efd78807b2d22c40",
+        "lastblockhash" : "0x602398db6dde6c981cf4bf33501e8b9b46ba17a9d01d6530615411e927550a9d",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d50g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d50g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x595fdfca1e5e084f1e1167f5a8f3d7728ab1aa64f50ae6e996280d96c2241999",
-                    "mixHash" : "0xacb801fe9080d6130af1aae0c670004de948e2c5c5de401f47a5593a17ce382f",
-                    "nonce" : "0x22abb44ad693ca52",
+                    "hash" : "0xc7463a1446a9ecfb97e75709749baf57a897ea09793695dedc1b3e2a241e8b21",
+                    "mixHash" : "0xee91bb339dd7c2cfcb380e863f4631efe9cc35c7251f165330fad0108bb88647",
+                    "nonce" : "0x7b30c91a095ed27d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0acb801fe9080d6130af1aae0c670004de948e2c5c5de401f47a5593a17ce382f8822abb44ad693ca52f85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab40ae3e7800155edc00fc5b6cdce1d56dec583d133cb7a0a12881f11481590fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ee91bb339dd7c2cfcb380e863f4631efe9cc35c7251f165330fad0108bb88647887b30c91a095ed27df85ff85d800183061a8080830186a08e6001600160016001af60006000f31ca0553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8a05c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487eec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001af60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x595fdfca1e5e084f1e1167f5a8f3d7728ab1aa64f50ae6e996280d96c2241999",
+        "lastblockhash" : "0xc7463a1446a9ecfb97e75709749baf57a897ea09793695dedc1b3e2a241e8b21",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0.json
index aa338bd00..f930c82a5 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d51g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x207a57cb2389c1f2cffb9880deaf1332709fe153c7af735e0214be6ee1d141f4",
-                    "mixHash" : "0x01175d66bacedf147fc59d6cac33bc18929a7712179049910b04e7ab3d2389f5",
-                    "nonce" : "0x1cf11225f0952263",
+                    "hash" : "0x364957a321e64c5b05c74b2811cc174bf12afd119fe64e8fb887dce62c875a26",
+                    "mixHash" : "0x2dc60ac2d51932d7574b5a633884c4ab59e33d5b2528201f5b32ef1f08fe1737",
+                    "nonce" : "0xc7754936c38e3102",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a001175d66bacedf147fc59d6cac33bc18929a7712179049910b04e7ab3d2389f5881cf11225f0952263f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02dc60ac2d51932d7574b5a633884c4ab59e33d5b2528201f5b32ef1f08fe173788c7754936c38e3102f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x207a57cb2389c1f2cffb9880deaf1332709fe153c7af735e0214be6ee1d141f4",
+        "lastblockhash" : "0x364957a321e64c5b05c74b2811cc174bf12afd119fe64e8fb887dce62c875a26",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d51g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x95284dab42b28bcc3ace8dcdd881e5c1e1fba7e4285397b5b033604eb2aaceed",
-                    "mixHash" : "0xcc5ef49b290c43f53323fc75d45ac90f229761b7d1ca5feb11a56d59f00f13b3",
-                    "nonce" : "0x5ca52959dfb7abfa",
+                    "hash" : "0x7ec35c38b00a9b67cdc5b3cf28f43bfdffb5bb58cc33bb87c273fd24ea291c70",
+                    "mixHash" : "0x89c55fe60f73cdc4e223792653d8d1be9b6026651c33217e83e4631b5ce1cb45",
+                    "nonce" : "0x41ead1cbbc8b4c8e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cc5ef49b290c43f53323fc75d45ac90f229761b7d1ca5feb11a56d59f00f13b3885ca52959dfb7abfaf85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a089c55fe60f73cdc4e223792653d8d1be9b6026651c33217e83e4631b5ce1cb458841ead1cbbc8b4c8ef85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95284dab42b28bcc3ace8dcdd881e5c1e1fba7e4285397b5b033604eb2aaceed",
+        "lastblockhash" : "0x7ec35c38b00a9b67cdc5b3cf28f43bfdffb5bb58cc33bb87c273fd24ea291c70",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d51g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5f0349adad643ba596dc1ed350084f83ea9bba331e22ac722cb9a8b84baf131c",
-                    "mixHash" : "0xa06986979af8644493eef5690713df768a64799e7f4170799c95953d89937dd8",
-                    "nonce" : "0x491871568e106b7f",
+                    "hash" : "0x7d69ea8ef72154fa0c04e09e70c6019ced0a388df40ed868f30cc741252caa47",
+                    "mixHash" : "0x9089f7e6fcb8ac4ac7333ea69d312674aee53935fad0746d6edb9c72f2f3ed86",
+                    "nonce" : "0xfb2271bea231946d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a06986979af8644493eef5690713df768a64799e7f4170799c95953d89937dd888491871568e106b7ff85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09089f7e6fcb8ac4ac7333ea69d312674aee53935fad0746d6edb9c72f2f3ed8688fb2271bea231946df85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f0349adad643ba596dc1ed350084f83ea9bba331e22ac722cb9a8b84baf131c",
+        "lastblockhash" : "0x7d69ea8ef72154fa0c04e09e70c6019ced0a388df40ed868f30cc741252caa47",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d51g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb18abc080af0ab5ec7f6ef9a0c039fdcac6ab3fc18e10ed152f79e49d4b642c8",
-                    "mixHash" : "0xb340c7ee255dd1f1c45f033cfb896bcd139c32a8e9aea34c1eed8f77759999d4",
-                    "nonce" : "0x89d6e8fe5c6e8f21",
+                    "hash" : "0xf1af27d55ecd4d0483a2c3045c03cec1e1710884b966cb57f106a6897f4024eb",
+                    "mixHash" : "0x25b6e9a4aaff418b88c4b562f29cd9042d810e0839e134b2438fcf225f1f8014",
+                    "nonce" : "0xdc63d9af0ec77414",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b340c7ee255dd1f1c45f033cfb896bcd139c32a8e9aea34c1eed8f77759999d48889d6e8fe5c6e8f21f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a025b6e9a4aaff418b88c4b562f29cd9042d810e0839e134b2438fcf225f1f801488dc63d9af0ec77414f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb18abc080af0ab5ec7f6ef9a0c039fdcac6ab3fc18e10ed152f79e49d4b642c8",
+        "lastblockhash" : "0xf1af27d55ecd4d0483a2c3045c03cec1e1710884b966cb57f106a6897f4024eb",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d51g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x211bf311c47aa72491cbc8d3a5635a8c3b966a2b0502e4832a7f7ec880054a1c",
-                    "mixHash" : "0xc2e3a8865d60f50434cfdc9d3b4be729f58eb034eca554a6bed8fa65fc7d3f14",
-                    "nonce" : "0x0d6805bcbad35b12",
+                    "hash" : "0xc9a13a2b82d01ce6cf9ace7d8e1d00930d58623ec2d850f48f7eb775a6a22023",
+                    "mixHash" : "0x74e5f68ef5e405adf86f825d719d87a6b1a1752a77260209c9c93341730ccb75",
+                    "nonce" : "0x39c68f210f0c3455",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c2e3a8865d60f50434cfdc9d3b4be729f58eb034eca554a6bed8fa65fc7d3f14880d6805bcbad35b12f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a074e5f68ef5e405adf86f825d719d87a6b1a1752a77260209c9c93341730ccb758839c68f210f0c3455f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x211bf311c47aa72491cbc8d3a5635a8c3b966a2b0502e4832a7f7ec880054a1c",
+        "lastblockhash" : "0xc9a13a2b82d01ce6cf9ace7d8e1d00930d58623ec2d850f48f7eb775a6a22023",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d51g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d51g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x443262f23f380f52d7b3f2ed7a2895dbeffe5d21567df9345f9d88e2e1831336",
-                    "mixHash" : "0x871abd8e3079b82176096c15ffbe948ce1ca73029c2c3dd46a16c9b6bdd192c0",
-                    "nonce" : "0xa39f9b3843be69de",
+                    "hash" : "0xc025882ba60cec65f8590ef0b971a8cc08a299430a878a9fda39435710454654",
+                    "mixHash" : "0xffe6d5bdc31418003a976bd0b45aa1d7c6b71e78eaab11485bf8e8ac78a58b98",
+                    "nonce" : "0xacafc05f874945c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x2dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0871abd8e3079b82176096c15ffbe948ce1ca73029c2c3dd46a16c9b6bdd192c088a39f9b3843be69def85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02dcdf0c8079654f49ef109eae0ffaa66a04be609a6392d6c0807f10503c775d2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffe6d5bdc31418003a976bd0b45aa1d7c6b71e78eaab11485bf8e8ac78a58b9888acafc05f874945c0f85ff85d800183061a8080830186a08e6001600160016001b060006000f31ca05f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87a07a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b060006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x443262f23f380f52d7b3f2ed7a2895dbeffe5d21567df9345f9d88e2e1831336",
+        "lastblockhash" : "0xc025882ba60cec65f8590ef0b971a8cc08a299430a878a9fda39435710454654",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0.json
index 7a70d2324..d27c326db 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d52g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc0f845c529aa90133bfd109e7e3b310de8d308e7760ea24ba4adf00635e44206",
-                    "mixHash" : "0xedf46ecc5f71ae35c5960d0fdcbb25d35066a77a52151e54aa266dcca45baf9d",
-                    "nonce" : "0x1b2ce5c302491a97",
+                    "hash" : "0x95684519ba917f559623581e739ae05f1e3ae5f34cde1e413a56db8426714bf5",
+                    "mixHash" : "0x79acee333eb297c30e0034b0e81d2cd2a6c381721220d886a037f39f387c9cb4",
+                    "nonce" : "0x897aa7d18d39c34f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0edf46ecc5f71ae35c5960d0fdcbb25d35066a77a52151e54aa266dcca45baf9d881b2ce5c302491a97f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a079acee333eb297c30e0034b0e81d2cd2a6c381721220d886a037f39f387c9cb488897aa7d18d39c34ff85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0f845c529aa90133bfd109e7e3b310de8d308e7760ea24ba4adf00635e44206",
+        "lastblockhash" : "0x95684519ba917f559623581e739ae05f1e3ae5f34cde1e413a56db8426714bf5",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d52g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x07e511ef29244dfd3dfb051c97bac44cc85d69abf4f376404d2d70734c6ec9be",
-                    "mixHash" : "0x69e47f1f96062d7c6670d3eb241ea73cc66f4bb10a2183ee267e95bc5cad1413",
-                    "nonce" : "0x26319fc07edb47bf",
+                    "hash" : "0x42753a44b825e2d0b060c04f24f9d5856e4e380b01ebf27173868ead89738a17",
+                    "mixHash" : "0xa7813184d22e12895af7dae766f0eb0a60fecabc28c36ae440b4860268bb86c2",
+                    "nonce" : "0x8ca923e1d0ece577",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a069e47f1f96062d7c6670d3eb241ea73cc66f4bb10a2183ee267e95bc5cad14138826319fc07edb47bff85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a7813184d22e12895af7dae766f0eb0a60fecabc28c36ae440b4860268bb86c2888ca923e1d0ece577f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07e511ef29244dfd3dfb051c97bac44cc85d69abf4f376404d2d70734c6ec9be",
+        "lastblockhash" : "0x42753a44b825e2d0b060c04f24f9d5856e4e380b01ebf27173868ead89738a17",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d52g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x59845cd1c29e455ad802d5b73728839070a92ad82c4c99d1dc673e856c5e2378",
-                    "mixHash" : "0xc64bc00dd6703c561c14f91e6f1412f3d9c2d00ce12a915f40fc89a9027f6f7c",
-                    "nonce" : "0xf22663d1aa5caaa2",
+                    "hash" : "0x19e72b054d024fa004d555eba883884e865b96193e866a612529934d2db7cf57",
+                    "mixHash" : "0x5c8ce75a7a983855a15d0e56c9255482c61ce2ea75f8680b614bd5b03f1792a4",
+                    "nonce" : "0xcaed88f3bf88701a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c64bc00dd6703c561c14f91e6f1412f3d9c2d00ce12a915f40fc89a9027f6f7c88f22663d1aa5caaa2f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05c8ce75a7a983855a15d0e56c9255482c61ce2ea75f8680b614bd5b03f1792a488caed88f3bf88701af85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59845cd1c29e455ad802d5b73728839070a92ad82c4c99d1dc673e856c5e2378",
+        "lastblockhash" : "0x19e72b054d024fa004d555eba883884e865b96193e866a612529934d2db7cf57",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d52g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xab7acfe2d75a348e513fbe1b14215dfafd441c0986bd4a7f9d2f154b545e0dc8",
-                    "mixHash" : "0xc4dfe383823106e8bfc8ba018162de3a60c032a9a650c1255ecd7c9fb2a7cad2",
-                    "nonce" : "0x5d730d2b06226070",
+                    "hash" : "0x31411a9600be2250466df9f7e5afad6cfb6fc513ec5fbde9aa625382cb1d4971",
+                    "mixHash" : "0xf9d63aefc149772679d1616fc40de9c28439c6a956f9c18f6060e714e0d58362",
+                    "nonce" : "0x67bac0dd801c69d9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c4dfe383823106e8bfc8ba018162de3a60c032a9a650c1255ecd7c9fb2a7cad2885d730d2b06226070f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f9d63aefc149772679d1616fc40de9c28439c6a956f9c18f6060e714e0d583628867bac0dd801c69d9f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab7acfe2d75a348e513fbe1b14215dfafd441c0986bd4a7f9d2f154b545e0dc8",
+        "lastblockhash" : "0x31411a9600be2250466df9f7e5afad6cfb6fc513ec5fbde9aa625382cb1d4971",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d52g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x206b307bdff838afa83c0fd917f0b8214f01df55e5a7a306d896a611e7145c3c",
-                    "mixHash" : "0xbb5b46ec85f2ddaf519c35e0334a1b5f087a416e76164b3496e069c0245c0577",
-                    "nonce" : "0x066b2741de555a49",
+                    "hash" : "0xe0a9f0ebe3971f33f2ac2156c815f8636702878854c942436b995b6c3cef850e",
+                    "mixHash" : "0xec6ffa1f3136b793566e02d0dfa7a5baf1a26775f36af287b3b5f52115ad5614",
+                    "nonce" : "0xe2496c81904e3953",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb5b46ec85f2ddaf519c35e0334a1b5f087a416e76164b3496e069c0245c057788066b2741de555a49f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ec6ffa1f3136b793566e02d0dfa7a5baf1a26775f36af287b3b5f52115ad561488e2496c81904e3953f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x206b307bdff838afa83c0fd917f0b8214f01df55e5a7a306d896a611e7145c3c",
+        "lastblockhash" : "0xe0a9f0ebe3971f33f2ac2156c815f8636702878854c942436b995b6c3cef850e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d52g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d52g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf983fdbd35d7b69a56e09ec4d12a9f62a3e61e29f1157f801c3cd2d86437fe9a",
-                    "mixHash" : "0x959a1803aaf9ad31e5e8d79b9384fed40e623020c39c3fba1cf27d03c6cfe164",
-                    "nonce" : "0x77fbfbc1039f7688",
+                    "hash" : "0x64b94577ae4ff6428bdd23cb8b90f567346d0c300bf0a7d129526fd32c689e82",
+                    "mixHash" : "0xe8e7c465fb3632670637952ec677ff740fb1e353c68697449f1f04d0c3cccda5",
+                    "nonce" : "0x7847cee07c5513b8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x4bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0959a1803aaf9ad31e5e8d79b9384fed40e623020c39c3fba1cf27d03c6cfe1648877fbfbc1039f7688f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04bc572690a28f41edd68cecb0e4d0b6ff3dad116a5bcab589d4ad2f2cf753a4ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e8e7c465fb3632670637952ec677ff740fb1e353c68697449f1f04d0c3cccda5887847cee07c5513b8f85ff85d800183061a8080830186a08e6001600160016001b160006000f31ca05b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8aa0797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafecc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b160006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf983fdbd35d7b69a56e09ec4d12a9f62a3e61e29f1157f801c3cd2d86437fe9a",
+        "lastblockhash" : "0x64b94577ae4ff6428bdd23cb8b90f567346d0c300bf0a7d129526fd32c689e82",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0.json
index 7acfe4e25..1ed1f84a3 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d53g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5cd4154989f9c4cd7b54459adbbfddd1602eec0848a47a33f47fa17ea381ae74",
-                    "mixHash" : "0xf1c7730ca70cb69bf998a981a03cde04c811a8583b0b212901598333056a1505",
-                    "nonce" : "0xa556ff37ccb8a860",
+                    "hash" : "0x41a6962a5c5ded831e8d9bae402857c99f6a7bb70baa50f3ca13bba27e37fbdf",
+                    "mixHash" : "0x5e214e0f2afb9ba35aca64bc1101c5bb8990163894b649b21de5d6b7e43752d9",
+                    "nonce" : "0xb2191fa3fa700a57",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f1c7730ca70cb69bf998a981a03cde04c811a8583b0b212901598333056a150588a556ff37ccb8a860f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05e214e0f2afb9ba35aca64bc1101c5bb8990163894b649b21de5d6b7e43752d988b2191fa3fa700a57f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cd4154989f9c4cd7b54459adbbfddd1602eec0848a47a33f47fa17ea381ae74",
+        "lastblockhash" : "0x41a6962a5c5ded831e8d9bae402857c99f6a7bb70baa50f3ca13bba27e37fbdf",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d53g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4714be01ba2a833571955fd00e3b4f918c895ccfd4d6327d7a03cf8134e0dbec",
-                    "mixHash" : "0xa150587e6ac115d2f2553141923d84526cf9525a8db8600b71bc7c0f22a8e970",
-                    "nonce" : "0x4caf71ce401d6454",
+                    "hash" : "0x0f492c5a4a320f3f5cb1ee42de205f7bf471618d56a95fbaaea3569a21ccb95c",
+                    "mixHash" : "0xb86b54d575ded702f273dc49220e0fa0928d6c56eca85869528a568b6fe986c6",
+                    "nonce" : "0x20523190b5d19b49",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a150587e6ac115d2f2553141923d84526cf9525a8db8600b71bc7c0f22a8e970884caf71ce401d6454f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b86b54d575ded702f273dc49220e0fa0928d6c56eca85869528a568b6fe986c68820523190b5d19b49f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4714be01ba2a833571955fd00e3b4f918c895ccfd4d6327d7a03cf8134e0dbec",
+        "lastblockhash" : "0x0f492c5a4a320f3f5cb1ee42de205f7bf471618d56a95fbaaea3569a21ccb95c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d53g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x39fa47fadbefc61d9c29bb3aab39e8ee3a43087750b69491997b6a3014d99605",
-                    "mixHash" : "0xe52acf4a7ba90a8f09b917bfdd02956933d8b725f7025e10975eb92a1db959cf",
-                    "nonce" : "0x6c7e0f17485a17bc",
+                    "hash" : "0xaee11855c894d9756336fb5838c4317ff150cc3e4e75df24d6c56a659f0fb32a",
+                    "mixHash" : "0x2c40b2fc2256db56b606d70987bd7083fc03c95e23ed43cd28d6f1e5fc5f0cf5",
+                    "nonce" : "0xb05484d371bc0428",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e52acf4a7ba90a8f09b917bfdd02956933d8b725f7025e10975eb92a1db959cf886c7e0f17485a17bcf85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c40b2fc2256db56b606d70987bd7083fc03c95e23ed43cd28d6f1e5fc5f0cf588b05484d371bc0428f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39fa47fadbefc61d9c29bb3aab39e8ee3a43087750b69491997b6a3014d99605",
+        "lastblockhash" : "0xaee11855c894d9756336fb5838c4317ff150cc3e4e75df24d6c56a659f0fb32a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d53g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1506d8dd5366fbbdddd99c6785573c9557f10adf8b666e7a9346744265a1192f",
-                    "mixHash" : "0x99e6731fc56db3062d218f04603cd53a147bd750bf2efd86513e6ca11cfb4809",
-                    "nonce" : "0x9b3d20f179e05080",
+                    "hash" : "0x8e7eed9098038d58a8df430774563d3e0774955c2a6a4cf7438bdb2dbcc29841",
+                    "mixHash" : "0xf87c671e36f43618b382611ccad167b81442664fdf47d93dcb55541e06050616",
+                    "nonce" : "0xa6256b05a2d8f24b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a099e6731fc56db3062d218f04603cd53a147bd750bf2efd86513e6ca11cfb4809889b3d20f179e05080f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f87c671e36f43618b382611ccad167b81442664fdf47d93dcb55541e0605061688a6256b05a2d8f24bf85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1506d8dd5366fbbdddd99c6785573c9557f10adf8b666e7a9346744265a1192f",
+        "lastblockhash" : "0x8e7eed9098038d58a8df430774563d3e0774955c2a6a4cf7438bdb2dbcc29841",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d53g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x42274972f59bc61e453d24868f4053e657c1918fdb781394e5cd4324551668d6",
-                    "mixHash" : "0x4e1352835ece05a53fb9336a8d2238a3909fa6a7d8073ac223fe7809b846ad25",
-                    "nonce" : "0xfc0208b4be86e76d",
+                    "hash" : "0xf9b4788997349b6482dd140fb94550297f8489adba20f28076f735765ac8905c",
+                    "mixHash" : "0x096c9216226e5244506e8c5773add5647620a0b8ab415cec9bc59633165d601d",
+                    "nonce" : "0x3110850c6aca8a25",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e1352835ece05a53fb9336a8d2238a3909fa6a7d8073ac223fe7809b846ad2588fc0208b4be86e76df85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0096c9216226e5244506e8c5773add5647620a0b8ab415cec9bc59633165d601d883110850c6aca8a25f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42274972f59bc61e453d24868f4053e657c1918fdb781394e5cd4324551668d6",
+        "lastblockhash" : "0xf9b4788997349b6482dd140fb94550297f8489adba20f28076f735765ac8905c",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d53g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d53g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x99b7b9fd93a621330deab6e424b149bbdcf27cad93a61717955bf0b68d7576ca",
-                    "mixHash" : "0x2252e0006bf77e9eff05ff5d840edeaf3c6d2c43afaaff584f45f1fda6c1eaa0",
-                    "nonce" : "0xd640c554680d4e55",
+                    "hash" : "0x9c6c3de22c2a9e111daded1d0d03800e1446ec1ba8b1d5f585ef8e955dcec058",
+                    "mixHash" : "0x3401c6699ab991372537aac220c5ec685582312722a673b78e43f744ed2e8582",
+                    "nonce" : "0x6cbaa91ff581727a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x64972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470daf",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02252e0006bf77e9eff05ff5d840edeaf3c6d2c43afaaff584f45f1fda6c1eaa088d640c554680d4e55f85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea064972a6ff66c7b0a36e36bfd135bd5f3ce20d5c3ab7697b6d07ed4e8ab470dafa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03401c6699ab991372537aac220c5ec685582312722a673b78e43f744ed2e8582886cbaa91ff581727af85ff85d800183061a8080830186a08e6001600160016001b260006000f31ca0045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cca036827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b260006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99b7b9fd93a621330deab6e424b149bbdcf27cad93a61717955bf0b68d7576ca",
+        "lastblockhash" : "0x9c6c3de22c2a9e111daded1d0d03800e1446ec1ba8b1d5f585ef8e955dcec058",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0.json
index 26e6e4656..26f7e0c35 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d54g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7080fd57f5450e91bfa6130a714a8a5a861d7ed87ef4a31a0265d2d0638ebc2b",
-                    "mixHash" : "0xef3193290d07371a2155cde2355dfb496bc4400a403efbeb33cac7bd97cc8113",
-                    "nonce" : "0x987f36d9c27d1a81",
+                    "hash" : "0x5fcd7c0c69ea275bd0cc7d5d15a9eca2c5da84de25a60997f7d9b095d4f50bfc",
+                    "mixHash" : "0x9393cc347ae90d3e1f931488a3c33cde5e97a31bb46698c9f167c2b9f1178558",
+                    "nonce" : "0xda5d049957cf83df",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef3193290d07371a2155cde2355dfb496bc4400a403efbeb33cac7bd97cc811388987f36d9c27d1a81f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09393cc347ae90d3e1f931488a3c33cde5e97a31bb46698c9f167c2b9f117855888da5d049957cf83dff85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7080fd57f5450e91bfa6130a714a8a5a861d7ed87ef4a31a0265d2d0638ebc2b",
+        "lastblockhash" : "0x5fcd7c0c69ea275bd0cc7d5d15a9eca2c5da84de25a60997f7d9b095d4f50bfc",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d54g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xece8e0a0e574c71d8f1138cf9d4c4cb12323fdc777b3390e32bec9a3b2bc0eb8",
-                    "mixHash" : "0x8898b13dc387d812703669708b7d776aa0ffcec423aaeb06828d3e3c38b7d940",
-                    "nonce" : "0x10c8fb017791b130",
+                    "hash" : "0xb5364763dfb306e94542516c71b5e4dba17282f60f3b0ac2b2d8911a9372ca0c",
+                    "mixHash" : "0x608bb56a56849c224e05c5610ff18de53a0986b971679bb108733b23193bb203",
+                    "nonce" : "0xc8ae322e004dbb97",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08898b13dc387d812703669708b7d776aa0ffcec423aaeb06828d3e3c38b7d9408810c8fb017791b130f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0608bb56a56849c224e05c5610ff18de53a0986b971679bb108733b23193bb20388c8ae322e004dbb97f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xece8e0a0e574c71d8f1138cf9d4c4cb12323fdc777b3390e32bec9a3b2bc0eb8",
+        "lastblockhash" : "0xb5364763dfb306e94542516c71b5e4dba17282f60f3b0ac2b2d8911a9372ca0c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d54g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xff789f012e08c5e70af81299b224af5558767e4da1df6769ff8fe7f5b4c5703d",
-                    "mixHash" : "0xc5f19d83278f8b5c7775dce8334fd4894806cbb33c47bf41da8be346fe94efd0",
-                    "nonce" : "0xa9e050228513b5ad",
+                    "hash" : "0x2d2343d78373896ca101d7572661836312128b284e190e919ad4031dee259c5e",
+                    "mixHash" : "0x0a5101999136e972b71d41c8382cf3a23259dfc3726bd31175970e2e3fb51017",
+                    "nonce" : "0x988b0345d2d5d94d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c5f19d83278f8b5c7775dce8334fd4894806cbb33c47bf41da8be346fe94efd088a9e050228513b5adf85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00a5101999136e972b71d41c8382cf3a23259dfc3726bd31175970e2e3fb5101788988b0345d2d5d94df85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff789f012e08c5e70af81299b224af5558767e4da1df6769ff8fe7f5b4c5703d",
+        "lastblockhash" : "0x2d2343d78373896ca101d7572661836312128b284e190e919ad4031dee259c5e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d54g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8d548b68dd93f9036af419cfe6b9179aa4fed2c8c3a79708ee6f33cdb19dae22",
-                    "mixHash" : "0x2ae251b7742cd1f5812bdec7d93926e43fbeacc8d1bb9ad21f15029affab0eb7",
-                    "nonce" : "0x1fe000254976be93",
+                    "hash" : "0x3444a2a94a5f3c55f4f55d203aa41f2a41d8c9ff835814c96bc90c281420f744",
+                    "mixHash" : "0xe9d9e321f48680944eff10ddaaaa1af04c4f60b8c6aa04599a819952f6e5a642",
+                    "nonce" : "0x77ec950824581d3f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ae251b7742cd1f5812bdec7d93926e43fbeacc8d1bb9ad21f15029affab0eb7881fe000254976be93f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e9d9e321f48680944eff10ddaaaa1af04c4f60b8c6aa04599a819952f6e5a6428877ec950824581d3ff85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d548b68dd93f9036af419cfe6b9179aa4fed2c8c3a79708ee6f33cdb19dae22",
+        "lastblockhash" : "0x3444a2a94a5f3c55f4f55d203aa41f2a41d8c9ff835814c96bc90c281420f744",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d54g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa740e0ee61403e95c0dbb4d56ffaad919c366742acc6b85ec0ea5f46708fae29",
-                    "mixHash" : "0x93cb5d77eb623776b5bc388bfe8d3275534e1a244f6e45b3aacdc4a6bffa880c",
-                    "nonce" : "0x533b607d168f5fb8",
+                    "hash" : "0xcb6a59df268ae378a763907173f515bae73e8a992877472b1ce3de0e3287238b",
+                    "mixHash" : "0x57151790c30f20d12c6b909c29506d0aa338c95e319c1cbb998dd1b4c22de758",
+                    "nonce" : "0x16d1a2447f7249df",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a093cb5d77eb623776b5bc388bfe8d3275534e1a244f6e45b3aacdc4a6bffa880c88533b607d168f5fb8f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057151790c30f20d12c6b909c29506d0aa338c95e319c1cbb998dd1b4c22de7588816d1a2447f7249dff85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa740e0ee61403e95c0dbb4d56ffaad919c366742acc6b85ec0ea5f46708fae29",
+        "lastblockhash" : "0xcb6a59df268ae378a763907173f515bae73e8a992877472b1ce3de0e3287238b",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d54g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d54g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbc26781c586062cb26ce43ea40af804f8062e90d65e49edaf96753e669aa64fe",
-                    "mixHash" : "0x996fc1e132f2fd44c65822593ce743c96d78dc32cdf804e05f2dfcd3d24cce45",
-                    "nonce" : "0xc3887098c9c9753e",
+                    "hash" : "0xd216d20c425cce896e557496e7f597361c77e3553f0e0b8e65ecc89777e8bb4d",
+                    "mixHash" : "0xa62e3568c78420c008a8fb2f41fc9718856b464d331b3895e8e7b8664e83bd8a",
+                    "nonce" : "0xce50365681251e90",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0996fc1e132f2fd44c65822593ce743c96d78dc32cdf804e05f2dfcd3d24cce4588c3887098c9c9753ef85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bff1b343382dd9c978e8de7616a1df447e195fcf18deed7f0bfce8be2466c148a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a62e3568c78420c008a8fb2f41fc9718856b464d331b3895e8e7b8664e83bd8a88ce50365681251e90f85ff85d800183061a8080830186a08e6001600160016001b360006000f31ca0642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8a05572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b360006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc26781c586062cb26ce43ea40af804f8062e90d65e49edaf96753e669aa64fe",
+        "lastblockhash" : "0xd216d20c425cce896e557496e7f597361c77e3553f0e0b8e65ecc89777e8bb4d",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0.json
index 4c71e1029..24d7dcaae 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d55g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xae3bcb24b6057f6e537994654987cab02d6459edd6213f9888936d2e008b87bb",
-                    "mixHash" : "0xa2411b95a3ec83215f0727ffd0b940c40ee93b69b9707159bf5695da73eaa4c4",
-                    "nonce" : "0xe87d4ca6f540a6f1",
+                    "hash" : "0x213935e48a3633a2ea4976cff782b50d3d8f8ad715d7ff8b29ba88a9809b54e7",
+                    "mixHash" : "0x36b5c1b2b83351d622917f8d2e62a14c2d5505d81d0cecb5899f6cde46cf65b4",
+                    "nonce" : "0x37e78698ba140657",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a2411b95a3ec83215f0727ffd0b940c40ee93b69b9707159bf5695da73eaa4c488e87d4ca6f540a6f1f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a036b5c1b2b83351d622917f8d2e62a14c2d5505d81d0cecb5899f6cde46cf65b48837e78698ba140657f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae3bcb24b6057f6e537994654987cab02d6459edd6213f9888936d2e008b87bb",
+        "lastblockhash" : "0x213935e48a3633a2ea4976cff782b50d3d8f8ad715d7ff8b29ba88a9809b54e7",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d55g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x01e9f307c47a49fc1d2a1743c3124025debd06587c748c3efc93d0bee233f84e",
-                    "mixHash" : "0x6db82f4ab03416609a6b6dc5fb6e2c5721c3aa0b87d52c7b72de6b4622a475c6",
-                    "nonce" : "0xfc97b85d5c15284d",
+                    "hash" : "0x6c04453c8ba24368e8c21f43d3fe3c1b72fadfe4b98b891d025882025aef23df",
+                    "mixHash" : "0x92799c592e92ea0649ca3a3aa3aeec919d1c425afb04f82d036ad030206b4f2f",
+                    "nonce" : "0xf2c2ce9826b720f7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06db82f4ab03416609a6b6dc5fb6e2c5721c3aa0b87d52c7b72de6b4622a475c688fc97b85d5c15284df85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a092799c592e92ea0649ca3a3aa3aeec919d1c425afb04f82d036ad030206b4f2f88f2c2ce9826b720f7f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01e9f307c47a49fc1d2a1743c3124025debd06587c748c3efc93d0bee233f84e",
+        "lastblockhash" : "0x6c04453c8ba24368e8c21f43d3fe3c1b72fadfe4b98b891d025882025aef23df",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d55g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5edfcd45d95a44a658bbd6e20f7ef23f293bde533100389e8eddf25d6fb739a6",
-                    "mixHash" : "0x2414f9a222bed04d872ce92cbd5726e54593bc55c3b0495707fb6eebb93a20e0",
-                    "nonce" : "0x6f2816d6f08fe58f",
+                    "hash" : "0x885dd54998fdcf6efcb4c835b4dd92c1a94348b210e97ff851044fcb45db7397",
+                    "mixHash" : "0x9030be507690aa31ebbc568bbefa5c0832faca4740732f939b76985a23ca4618",
+                    "nonce" : "0xe91a911c90ac5087",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02414f9a222bed04d872ce92cbd5726e54593bc55c3b0495707fb6eebb93a20e0886f2816d6f08fe58ff85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09030be507690aa31ebbc568bbefa5c0832faca4740732f939b76985a23ca461888e91a911c90ac5087f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5edfcd45d95a44a658bbd6e20f7ef23f293bde533100389e8eddf25d6fb739a6",
+        "lastblockhash" : "0x885dd54998fdcf6efcb4c835b4dd92c1a94348b210e97ff851044fcb45db7397",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d55g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1e1b2f04d02e655fc1db836487e1689217f323e026b9f5938718354fa413ffdf",
-                    "mixHash" : "0xbacf787727a60fade5c8c7d5ce6978d721837f420312c32a70c24c286ede7840",
-                    "nonce" : "0xea485584ebe30f68",
+                    "hash" : "0xb66f4852e296ed553fc7ebbd4caa7e54df93cfe90ea4217d088338aea2307759",
+                    "mixHash" : "0x390437423402a4c6447489671d8c78bde4bf9f28ae95d145ed96b3a6d05121c3",
+                    "nonce" : "0x33812abffaef7dc7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bacf787727a60fade5c8c7d5ce6978d721837f420312c32a70c24c286ede784088ea485584ebe30f68f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0390437423402a4c6447489671d8c78bde4bf9f28ae95d145ed96b3a6d05121c38833812abffaef7dc7f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e1b2f04d02e655fc1db836487e1689217f323e026b9f5938718354fa413ffdf",
+        "lastblockhash" : "0xb66f4852e296ed553fc7ebbd4caa7e54df93cfe90ea4217d088338aea2307759",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d55g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5d263d630d8310df021ef16460a0bc406fdbf04587b2cdf7fd396bdec5ebe0f1",
-                    "mixHash" : "0x1d42732c54d6c55d5ccb6dcc5aae348d271cd0ad968bee520b9c8110545d142a",
-                    "nonce" : "0xa72a886e8335bc0f",
+                    "hash" : "0x1c78ec0dd1f4c6d5f260a7f14c4df846ed3b95849622ce5ab36b97efa46279aa",
+                    "mixHash" : "0xe9b88216e4f81db5dc72b49c953bf1ef0c47ff0f1d69a6bb709f51690765f1b9",
+                    "nonce" : "0x3221ff28cdaa4d50",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d42732c54d6c55d5ccb6dcc5aae348d271cd0ad968bee520b9c8110545d142a88a72a886e8335bc0ff85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e9b88216e4f81db5dc72b49c953bf1ef0c47ff0f1d69a6bb709f51690765f1b9883221ff28cdaa4d50f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d263d630d8310df021ef16460a0bc406fdbf04587b2cdf7fd396bdec5ebe0f1",
+        "lastblockhash" : "0x1c78ec0dd1f4c6d5f260a7f14c4df846ed3b95849622ce5ab36b97efa46279aa",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d55g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d55g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfe257cc6a27eac9f209032afa8c9447812580f043779065ab0a83402e4cfab39",
-                    "mixHash" : "0xe040433993aef5d2a38466969b218977c098266573e966a02f5b9ef3789d76b6",
-                    "nonce" : "0x284fb95e51f28146",
+                    "hash" : "0xbe4739cb6e8005ba5715c755f916f1cfeecbe01b7a251e56f3e6f5165f4b0fcf",
+                    "mixHash" : "0xd7eaa502b8e0003f084b50f8c78bd59508d9e722ae48ea7213e17d1f9faaa92a",
+                    "nonce" : "0x3ded5416e04ea56f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e040433993aef5d2a38466969b218977c098266573e966a02f5b9ef3789d76b688284fb95e51f28146f85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05409848b57fe92253958fbd45cda64baf09168f0a996601523d4347b28d12bb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d7eaa502b8e0003f084b50f8c78bd59508d9e722ae48ea7213e17d1f9faaa92a883ded5416e04ea56ff85ff85d800183061a8080830186a08e6001600160016001b460006000f31ba02c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0a03b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cadc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b460006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe257cc6a27eac9f209032afa8c9447812580f043779065ab0a83402e4cfab39",
+        "lastblockhash" : "0xbe4739cb6e8005ba5715c755f916f1cfeecbe01b7a251e56f3e6f5165f4b0fcf",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0.json
index 2558ee898..f8216a5ac 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d56g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x51a28bf760e015afb374d60eb85827fbf5c1553a380663fbdb4f2d52cc20caa5",
-                    "mixHash" : "0xb447cde16b8cb24ede485193044b04cf7f08f640073774088002a4802e2146f9",
-                    "nonce" : "0xb30169db26dde184",
+                    "hash" : "0x6a8ee33c300902e12bd30f4c4cecd9dae34c34820f80fbf301a42183352a55f3",
+                    "mixHash" : "0x85a1fa0e3284d68e09763af0458626ecf2d8b935c1f68dafed94d059764c9311",
+                    "nonce" : "0x2caa69e49a1eddc1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b447cde16b8cb24ede485193044b04cf7f08f640073774088002a4802e2146f988b30169db26dde184f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a085a1fa0e3284d68e09763af0458626ecf2d8b935c1f68dafed94d059764c9311882caa69e49a1eddc1f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51a28bf760e015afb374d60eb85827fbf5c1553a380663fbdb4f2d52cc20caa5",
+        "lastblockhash" : "0x6a8ee33c300902e12bd30f4c4cecd9dae34c34820f80fbf301a42183352a55f3",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d56g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7db82f88af650fc2714de67573ede6afa2a7a2837eb35fe9f639f5dee168b8b9",
-                    "mixHash" : "0x82343d32ef0f5211b811ae101ebbefd841b9d46da6bb2dafa6aee085a246a21c",
-                    "nonce" : "0xc86028a2327ec2c9",
+                    "hash" : "0x90fb18e5d535946c237036fdedaec90097d0e50ba328c9092dc3db5c113750c4",
+                    "mixHash" : "0x637cc03ca33e6c3c6e35e4eda33f25b711c9656f4078d147e40debeaf5aa7cc6",
+                    "nonce" : "0x257767fd413973f1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082343d32ef0f5211b811ae101ebbefd841b9d46da6bb2dafa6aee085a246a21c88c86028a2327ec2c9f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0637cc03ca33e6c3c6e35e4eda33f25b711c9656f4078d147e40debeaf5aa7cc688257767fd413973f1f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7db82f88af650fc2714de67573ede6afa2a7a2837eb35fe9f639f5dee168b8b9",
+        "lastblockhash" : "0x90fb18e5d535946c237036fdedaec90097d0e50ba328c9092dc3db5c113750c4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d56g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1c5fb953177f9a50abdea8e2484693df3dc21555c2eeee5790555721a55652cc",
-                    "mixHash" : "0x522e052211c2bff336544bc26ae2f10a37231e4c82a67a889bc256fc1196332c",
-                    "nonce" : "0x42a4e36544ca1331",
+                    "hash" : "0xbcf60544b515ed1fd715a53bff1a4d52a3c582b97c636d7333d9075715a9aa76",
+                    "mixHash" : "0xdb3a8669dca17d5e372026b92355314e6155d9bf306e10b9509fdde5d1547656",
+                    "nonce" : "0xbaad3ca39781d00e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0522e052211c2bff336544bc26ae2f10a37231e4c82a67a889bc256fc1196332c8842a4e36544ca1331f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0db3a8669dca17d5e372026b92355314e6155d9bf306e10b9509fdde5d154765688baad3ca39781d00ef85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c5fb953177f9a50abdea8e2484693df3dc21555c2eeee5790555721a55652cc",
+        "lastblockhash" : "0xbcf60544b515ed1fd715a53bff1a4d52a3c582b97c636d7333d9075715a9aa76",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d56g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8a19344c81d000d3877d9d680ead44936e668d80efb4f9c7c4df58f38aa9845c",
-                    "mixHash" : "0x552a7f4467b5c81e91862b865eea76e487d93eceb8f102d1f9962fa438e7da61",
-                    "nonce" : "0x1b5d7ca158f75b84",
+                    "hash" : "0xf0e28b83a886de071b5404b3f6795a66024eeb570a401f11571798c0b436358f",
+                    "mixHash" : "0x0b73855c480bce61bce25e9a82cec79cd6700208f3b6936cee6e7069eb69b639",
+                    "nonce" : "0x9f4cab5cd9bb0702",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0552a7f4467b5c81e91862b865eea76e487d93eceb8f102d1f9962fa438e7da61881b5d7ca158f75b84f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00b73855c480bce61bce25e9a82cec79cd6700208f3b6936cee6e7069eb69b639889f4cab5cd9bb0702f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a19344c81d000d3877d9d680ead44936e668d80efb4f9c7c4df58f38aa9845c",
+        "lastblockhash" : "0xf0e28b83a886de071b5404b3f6795a66024eeb570a401f11571798c0b436358f",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d56g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdca99499aa02423abfe36367acabedf160f83ac35a9c1e1eda187908e8d157fe",
-                    "mixHash" : "0x884513a2613bca9fb26627498d341cf51781cce8d384e2e39852387484c534f7",
-                    "nonce" : "0x3f0bb5b4953befe1",
+                    "hash" : "0xf3f9088738fb06e4417fb10eb9b4b952dcfeee3c96b387b1117d12ec29cbf5ed",
+                    "mixHash" : "0x0faff0f2e2b8d0b1ca623bcc698da22808ba4168a0462b011f39c1b147d4148b",
+                    "nonce" : "0x8988592a88b5edca",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0884513a2613bca9fb26627498d341cf51781cce8d384e2e39852387484c534f7883f0bb5b4953befe1f85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00faff0f2e2b8d0b1ca623bcc698da22808ba4168a0462b011f39c1b147d4148b888988592a88b5edcaf85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdca99499aa02423abfe36367acabedf160f83ac35a9c1e1eda187908e8d157fe",
+        "lastblockhash" : "0xf3f9088738fb06e4417fb10eb9b4b952dcfeee3c96b387b1117d12ec29cbf5ed",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d56g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d56g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf1449cab3d2ff92700f8f21ad848bd2d247dcf3a2c7af86d10f064034d4112c0",
-                    "mixHash" : "0xc2f55a9a8b768ac53379bad5ebb8575605d02d7e5d6f39f8f1679535b12347b9",
-                    "nonce" : "0x2b7a4ca2128aecae",
+                    "hash" : "0x1ff99efa8b17832e89dea45c6ac565120309a6907cee21b18cac908f017498e9",
+                    "mixHash" : "0x2d098e7944006d21ee7b1356904fe86dc5210b342d52a9487ecb0d4c70c6de5c",
+                    "nonce" : "0xf081075794070e0e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c2f55a9a8b768ac53379bad5ebb8575605d02d7e5d6f39f8f1679535b12347b9882b7a4ca2128aecaef85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ab4707f6ab4a6a22e0c71553da33377e7886e86bf408d8118dc3f78aeddfd8a0a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d098e7944006d21ee7b1356904fe86dc5210b342d52a9487ecb0d4c70c6de5c88f081075794070e0ef85ff85d800183061a8080830186a08e6001600160016001b560006000f31ca05d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2a0744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1449cab3d2ff92700f8f21ad848bd2d247dcf3a2c7af86d10f064034d4112c0",
+        "lastblockhash" : "0x1ff99efa8b17832e89dea45c6ac565120309a6907cee21b18cac908f017498e9",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0.json
index 1f7d94aa8..3fbe3c7f6 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d57g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc7e4f164edb4f2fcd37518f246b82827f0e6fec5695fa10858f0d139f107a2ab",
-                    "mixHash" : "0x97d7ba1d9a6e9ec22c996dc9beb7347d7db78e777621c8cf6afab6588a45b95d",
-                    "nonce" : "0x7d1d195286b7e929",
+                    "hash" : "0x251e8e630de9417ddc6de4c1ad869bba60f29f3fb0858a0391aa7d42e5a9307d",
+                    "mixHash" : "0x7edec2c40359f8cb53967e177e1ca73ce2c57da3946745e8031a38b934cd6847",
+                    "nonce" : "0x012015528f5f82c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a097d7ba1d9a6e9ec22c996dc9beb7347d7db78e777621c8cf6afab6588a45b95d887d1d195286b7e929f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07edec2c40359f8cb53967e177e1ca73ce2c57da3946745e8031a38b934cd684788012015528f5f82c0f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7e4f164edb4f2fcd37518f246b82827f0e6fec5695fa10858f0d139f107a2ab",
+        "lastblockhash" : "0x251e8e630de9417ddc6de4c1ad869bba60f29f3fb0858a0391aa7d42e5a9307d",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d57g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf20b317b519cffeaeaaea776835b4305506e1ea1cae06256ca3ad76d47d7852f",
-                    "mixHash" : "0x65473fd115b4c6255ec30aa471d4fc83dd5b8b85593109a4acde62231a2814f6",
-                    "nonce" : "0xd1b0164e865ca23a",
+                    "hash" : "0x45e9675d6fc5ab739f43928a7cf30d815943a5c468f3ff47ebebdc57e4669ddc",
+                    "mixHash" : "0x4263f711092bad8bd11c71ddfc1a2b9763d4453e3ca5fd6c25251462c83e9b71",
+                    "nonce" : "0x099f8f5e997cce47",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a065473fd115b4c6255ec30aa471d4fc83dd5b8b85593109a4acde62231a2814f688d1b0164e865ca23af85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04263f711092bad8bd11c71ddfc1a2b9763d4453e3ca5fd6c25251462c83e9b7188099f8f5e997cce47f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf20b317b519cffeaeaaea776835b4305506e1ea1cae06256ca3ad76d47d7852f",
+        "lastblockhash" : "0x45e9675d6fc5ab739f43928a7cf30d815943a5c468f3ff47ebebdc57e4669ddc",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d57g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf33878c831191c4ecccc715511ea3901efc68d825fe617bd4651a392c02ab130",
-                    "mixHash" : "0xb85cdfe8a843b87e056c2e8336732cc4b7689d872f8ea36fda29b1c57536caff",
-                    "nonce" : "0x52d41b7062bb4382",
+                    "hash" : "0x6d776b0f1a719d94273033dc45a5b958d84e046b62535533673a0ce5e4e55e4f",
+                    "mixHash" : "0x5d897305ecd814c61bc1f7f661ab144f98a1a77726b745f5691bddae9decd417",
+                    "nonce" : "0x62b512017dd693f0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b85cdfe8a843b87e056c2e8336732cc4b7689d872f8ea36fda29b1c57536caff8852d41b7062bb4382f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05d897305ecd814c61bc1f7f661ab144f98a1a77726b745f5691bddae9decd4178862b512017dd693f0f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf33878c831191c4ecccc715511ea3901efc68d825fe617bd4651a392c02ab130",
+        "lastblockhash" : "0x6d776b0f1a719d94273033dc45a5b958d84e046b62535533673a0ce5e4e55e4f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d57g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf3a24b126ee2f2721ac92541e24ec18917b3cb078c31c5c5a33357f58507a200",
-                    "mixHash" : "0x270e60da015743dfc31d8bb04762ebd2a510a43e5e7501c073b34ea139b5f14c",
-                    "nonce" : "0xe62afce49316511f",
+                    "hash" : "0x2781a4048537a77c3f5e12717fd8df6f33cb4973f9e4a866d3e004aba50919c7",
+                    "mixHash" : "0x5853d7aa73432fe810153235e5899c54cc397e4b7e840decd65c01ec0588a769",
+                    "nonce" : "0xb7b799ecb1fbc821",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0270e60da015743dfc31d8bb04762ebd2a510a43e5e7501c073b34ea139b5f14c88e62afce49316511ff85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05853d7aa73432fe810153235e5899c54cc397e4b7e840decd65c01ec0588a76988b7b799ecb1fbc821f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3a24b126ee2f2721ac92541e24ec18917b3cb078c31c5c5a33357f58507a200",
+        "lastblockhash" : "0x2781a4048537a77c3f5e12717fd8df6f33cb4973f9e4a866d3e004aba50919c7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d57g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2ce59fa3aeb8468f29130e32a481e48d940ef848ac50a97b5bb6b02dfed37fb8",
-                    "mixHash" : "0x1f5d3f118720e89fc64aa5820cb0a05fb50092eb0aebddfc815d688d563a0227",
-                    "nonce" : "0xa16b60368e8fd831",
+                    "hash" : "0x4810d2378e188e47df11ecda10960295990c6d1e0be7a1da0883e55790732186",
+                    "mixHash" : "0x1443a7af897630226d4290c586d2bbc19f5ab79e08f053c4927af2992d3a7ad0",
+                    "nonce" : "0x0c7b2ef64020ac0a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f5d3f118720e89fc64aa5820cb0a05fb50092eb0aebddfc815d688d563a022788a16b60368e8fd831f85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01443a7af897630226d4290c586d2bbc19f5ab79e08f053c4927af2992d3a7ad0880c7b2ef64020ac0af85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ce59fa3aeb8468f29130e32a481e48d940ef848ac50a97b5bb6b02dfed37fb8",
+        "lastblockhash" : "0x4810d2378e188e47df11ecda10960295990c6d1e0be7a1da0883e55790732186",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d57g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d57g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcd364b775f235bd2a59350b9c2464394713b22fd63e655c5e912c6040c73b7e4",
-                    "mixHash" : "0xc6bc1982641643ff99ffefcc01c134c38cc433e7090b512762478912ffcecdae",
-                    "nonce" : "0x5b7eac029bacc02d",
+                    "hash" : "0x616a20c327970e26b77a86f5f8433777816a13c36f4201e89c9efb3b4156c1db",
+                    "mixHash" : "0x94fff70a73658b907b95a7cbaf995e7cf29209eaa67e0451af26824a920a3e17",
+                    "nonce" : "0x3c05061b3831192f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c6bc1982641643ff99ffefcc01c134c38cc433e7090b512762478912ffcecdae885b7eac029bacc02df85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03941c0ee324dd60c795f6066735e54978795fdd7d8c48982d6644d57396fceb1a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a094fff70a73658b907b95a7cbaf995e7cf29209eaa67e0451af26824a920a3e17883c05061b3831192ff85ff85d800183061a8080830186a08e6001600160016001b660006000f31ca0c99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4ea002d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd364b775f235bd2a59350b9c2464394713b22fd63e655c5e912c6040c73b7e4",
+        "lastblockhash" : "0x616a20c327970e26b77a86f5f8433777816a13c36f4201e89c9efb3b4156c1db",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0.json
index 9f34e785c..d1da1f1d8 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d58g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcbc43ac03ccc4ca90d9e22ae5477dccef8007d13ac958e157334101db868130d",
-                    "mixHash" : "0x1795644cbb0df44a542b03ccc2212b8a7d6dacea3b78a4a101392a0f34d4d680",
-                    "nonce" : "0xfa97156a10a1bd3d",
+                    "hash" : "0x15f138e1d8bae1ff8bef9e6aec18fa99b6ba96c0a669e517e432369acff2fcd5",
+                    "mixHash" : "0x633432023c4a6f29a5fb5813c72c98894f8d560d5bc5830cfff73282a391938c",
+                    "nonce" : "0x1071b1293c48ee31",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01795644cbb0df44a542b03ccc2212b8a7d6dacea3b78a4a101392a0f34d4d68088fa97156a10a1bd3df85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0633432023c4a6f29a5fb5813c72c98894f8d560d5bc5830cfff73282a391938c881071b1293c48ee31f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbc43ac03ccc4ca90d9e22ae5477dccef8007d13ac958e157334101db868130d",
+        "lastblockhash" : "0x15f138e1d8bae1ff8bef9e6aec18fa99b6ba96c0a669e517e432369acff2fcd5",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d58g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3d40da2dd33cf10a68d2e63317c2e1f879145f5e7aba49963cdd398a76cc40c5",
-                    "mixHash" : "0x5136d87f7448d05faacb846d9b3cea9327158a30a2bf3e29e2ffa296e89aed86",
-                    "nonce" : "0x01fe4fb8d46249e9",
+                    "hash" : "0xf990ca5e10717bf22e42d26dd964e323eff98ff113aea70501a26ad443fc9ad6",
+                    "mixHash" : "0xffc54e767319aec019ba4102d642d53b6e64c91badb3a707bffff07b7bb0c76c",
+                    "nonce" : "0x8da02d9cb25d1db9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05136d87f7448d05faacb846d9b3cea9327158a30a2bf3e29e2ffa296e89aed868801fe4fb8d46249e9f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffc54e767319aec019ba4102d642d53b6e64c91badb3a707bffff07b7bb0c76c888da02d9cb25d1db9f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d40da2dd33cf10a68d2e63317c2e1f879145f5e7aba49963cdd398a76cc40c5",
+        "lastblockhash" : "0xf990ca5e10717bf22e42d26dd964e323eff98ff113aea70501a26ad443fc9ad6",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d58g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc80ab4bfe0950f208169e0df8361ff74651421c62c5f9f8735bf40d59eaff219",
-                    "mixHash" : "0x39dd1148889f8afe77b5b7403ee78cbceb4ff4a8607a35a18c0021c6f6974848",
-                    "nonce" : "0x2f0e8d2344c9daa3",
+                    "hash" : "0x4738ceec7a710dd3120f4e633ba008179737341bc6f4e90d12f56335d85e2e9a",
+                    "mixHash" : "0x0e6c9e2368e991852cfabe954c8ab35b2517537abda92c3a10e8bdc6b3544109",
+                    "nonce" : "0x0daf4077cb382b5a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a039dd1148889f8afe77b5b7403ee78cbceb4ff4a8607a35a18c0021c6f6974848882f0e8d2344c9daa3f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00e6c9e2368e991852cfabe954c8ab35b2517537abda92c3a10e8bdc6b3544109880daf4077cb382b5af85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc80ab4bfe0950f208169e0df8361ff74651421c62c5f9f8735bf40d59eaff219",
+        "lastblockhash" : "0x4738ceec7a710dd3120f4e633ba008179737341bc6f4e90d12f56335d85e2e9a",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d58g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3efafce3570499bef37300e1be106407109d9ac5cd82065ddcf92bf7ff251b14",
-                    "mixHash" : "0x126ab6feade9ee08d019d057d53a7a80f3586fb3192e9ccd9538523353ae9b4f",
-                    "nonce" : "0x9090dc1324516073",
+                    "hash" : "0xe4703d99e9aca5394f2a6fd66c3425dc85d0c3e71b82ab97b0e75cb0ceb857d7",
+                    "mixHash" : "0x855bf9601a975e8f246f24b3277acaa51caf835f9d0ae3a6fe71d944d3292a3a",
+                    "nonce" : "0xe4c6ee4207237cbc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0126ab6feade9ee08d019d057d53a7a80f3586fb3192e9ccd9538523353ae9b4f889090dc1324516073f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0855bf9601a975e8f246f24b3277acaa51caf835f9d0ae3a6fe71d944d3292a3a88e4c6ee4207237cbcf85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3efafce3570499bef37300e1be106407109d9ac5cd82065ddcf92bf7ff251b14",
+        "lastblockhash" : "0xe4703d99e9aca5394f2a6fd66c3425dc85d0c3e71b82ab97b0e75cb0ceb857d7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d58g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x491eae7644159d6f51420b024cc37ffd0bff0f5c05ff0ad9483a07274592b70e",
-                    "mixHash" : "0x0cb23ea804de2ba968195523f6aa9f990594cab2ee3e272abfcd7a82d95c6e4d",
-                    "nonce" : "0x5e113e4d256ed207",
+                    "hash" : "0xd30d19d83be7c5fc748580bb9cfa09bb7479c1b68ffc3b7a11b35e2fc393b85f",
+                    "mixHash" : "0x9b5634d031f9021dbea5bb684edcad9f74e8bace60ac9cf28e561be268c759b4",
+                    "nonce" : "0x23ae1d5569946fea",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00cb23ea804de2ba968195523f6aa9f990594cab2ee3e272abfcd7a82d95c6e4d885e113e4d256ed207f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09b5634d031f9021dbea5bb684edcad9f74e8bace60ac9cf28e561be268c759b48823ae1d5569946feaf85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x491eae7644159d6f51420b024cc37ffd0bff0f5c05ff0ad9483a07274592b70e",
+        "lastblockhash" : "0xd30d19d83be7c5fc748580bb9cfa09bb7479c1b68ffc3b7a11b35e2fc393b85f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d58g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d58g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8837716d04e2aabb242f38de83ce5ca770b9c5fd8aafe71f0abf8de94be3deef",
-                    "mixHash" : "0xd26e8ce85ff46801e22bea0dae51a538628acbcf76fe3e320e884ba058f97684",
-                    "nonce" : "0x6b2f80fe35d693a4",
+                    "hash" : "0x7bf4e58e26fc771bc68e3b2aea5471751376ff2687627b1406f49395b0099521",
+                    "mixHash" : "0xe708aee9f1a407a54501a80c2b547bbb67052fee1193d117c11227bdedf8d8f4",
+                    "nonce" : "0xb8d2c6cec1d44ebb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x35e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d26e8ce85ff46801e22bea0dae51a538628acbcf76fe3e320e884ba058f97684886b2f80fe35d693a4f85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea035e7c3e031371c4f1718cc7334b3a21438bf1626b9c32b3a22a620d700d394a4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e708aee9f1a407a54501a80c2b547bbb67052fee1193d117c11227bdedf8d8f488b8d2c6cec1d44ebbf85ff85d800183061a8080830186a08e6001600160016001b760006000f31ca079593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0a05569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8837716d04e2aabb242f38de83ce5ca770b9c5fd8aafe71f0abf8de94be3deef",
+        "lastblockhash" : "0x7bf4e58e26fc771bc68e3b2aea5471751376ff2687627b1406f49395b0099521",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0.json
index 0d05bd3bd..633b3a8a1 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d59g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc7cfb4efe206e8e2be32e1fe452f8deba1b1dfd8f716b09c455b341a85c1cd4f",
-                    "mixHash" : "0x7454d5346290ef0c2beab1252abecbed55837a3101e86f0b08d51490f31d6630",
-                    "nonce" : "0xf7cea80e27d689c1",
+                    "hash" : "0x822263b4e8260288c9c5ed112099086fddbeb7ee886a6682b26b991ebd8279d2",
+                    "mixHash" : "0xde180b1cad9f33c3107fbd4c0c09e25134bd36432b053a0c82fffcf3d3e7a655",
+                    "nonce" : "0x81a7ee5c57ef135b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07454d5346290ef0c2beab1252abecbed55837a3101e86f0b08d51490f31d663088f7cea80e27d689c1f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0de180b1cad9f33c3107fbd4c0c09e25134bd36432b053a0c82fffcf3d3e7a6558881a7ee5c57ef135bf85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7cfb4efe206e8e2be32e1fe452f8deba1b1dfd8f716b09c455b341a85c1cd4f",
+        "lastblockhash" : "0x822263b4e8260288c9c5ed112099086fddbeb7ee886a6682b26b991ebd8279d2",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d59g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x288d859bfa3f7e3f30f3a9ddda56eac7a84d187300035c5b1ee37202adc3dbab",
-                    "mixHash" : "0x28dacb4022413f027716a157089e1fae3af6fb64bb079397dc7c19931d24ed4d",
-                    "nonce" : "0xf21503c09c5627a4",
+                    "hash" : "0x47bb1961f38190c24a6165762deed9b94435cc0bfc70442e074e8f326c008233",
+                    "mixHash" : "0xfb1300fca2a10f6c7b672f07f85bb91ab425aded46a4e794868a7cb285cf1bf9",
+                    "nonce" : "0xf681f833978c0af3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a028dacb4022413f027716a157089e1fae3af6fb64bb079397dc7c19931d24ed4d88f21503c09c5627a4f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb1300fca2a10f6c7b672f07f85bb91ab425aded46a4e794868a7cb285cf1bf988f681f833978c0af3f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x288d859bfa3f7e3f30f3a9ddda56eac7a84d187300035c5b1ee37202adc3dbab",
+        "lastblockhash" : "0x47bb1961f38190c24a6165762deed9b94435cc0bfc70442e074e8f326c008233",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d59g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xece83cb176310688525127fea12e69c632c01b238696f063a88e4290235a2ab7",
-                    "mixHash" : "0xf91e698958e9c33287dd77b9ca2484ad85b782fc62f4efe2ce9be13ff50d2a57",
-                    "nonce" : "0x45a05849dc32f69d",
+                    "hash" : "0x9dd589343aa61f3737cf07e1d6bb0a947114768fd837318f5cc0d3a9ead109f6",
+                    "mixHash" : "0x6d7206c3554eb040745b8b4cdf1c7823cfeca653cd528c3bad6d171eea23f616",
+                    "nonce" : "0x2a742bb4caa129c4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f91e698958e9c33287dd77b9ca2484ad85b782fc62f4efe2ce9be13ff50d2a578845a05849dc32f69df85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06d7206c3554eb040745b8b4cdf1c7823cfeca653cd528c3bad6d171eea23f616882a742bb4caa129c4f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xece83cb176310688525127fea12e69c632c01b238696f063a88e4290235a2ab7",
+        "lastblockhash" : "0x9dd589343aa61f3737cf07e1d6bb0a947114768fd837318f5cc0d3a9ead109f6",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d59g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x901ad41104f0bb94cdfdf0bd8659976974b56960bbd36e59d18a0d3161238c02",
-                    "mixHash" : "0x66181e33fb5f3da9c904f085cdb006d3471f9d6288ad23e90552896c892a3e78",
-                    "nonce" : "0xf17b4f30b184dc84",
+                    "hash" : "0x9c55345750e7de4338f6f24bb74415bf163d24406e773cf391ed25360cc23256",
+                    "mixHash" : "0x3365b4e5279fa650a78b912dbc630cfbf27c1e65c8f6152d35adb599503c3df8",
+                    "nonce" : "0x8bcfaabe7c172ff9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a066181e33fb5f3da9c904f085cdb006d3471f9d6288ad23e90552896c892a3e7888f17b4f30b184dc84f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03365b4e5279fa650a78b912dbc630cfbf27c1e65c8f6152d35adb599503c3df8888bcfaabe7c172ff9f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x901ad41104f0bb94cdfdf0bd8659976974b56960bbd36e59d18a0d3161238c02",
+        "lastblockhash" : "0x9c55345750e7de4338f6f24bb74415bf163d24406e773cf391ed25360cc23256",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d59g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf4744702db5418e5d8552b0282ac6bd6b16a74ee5563b0de69c876319334f4a9",
-                    "mixHash" : "0xac419a3c655f24520b85da0546c0a58dfa7698495858f2a13f6d7442d5e31d02",
-                    "nonce" : "0x1b4a76e3710dd891",
+                    "hash" : "0x8683196f93ff9f88bec651ceebed2f041e83e949a0a39da317ab2aed0a1197fd",
+                    "mixHash" : "0x296e3c23adcb2b3a6b729a21ba683c728aeb5577067db8afb886475cd3bbd1d2",
+                    "nonce" : "0x83a7e9b858f52b25",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac419a3c655f24520b85da0546c0a58dfa7698495858f2a13f6d7442d5e31d02881b4a76e3710dd891f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0296e3c23adcb2b3a6b729a21ba683c728aeb5577067db8afb886475cd3bbd1d28883a7e9b858f52b25f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4744702db5418e5d8552b0282ac6bd6b16a74ee5563b0de69c876319334f4a9",
+        "lastblockhash" : "0x8683196f93ff9f88bec651ceebed2f041e83e949a0a39da317ab2aed0a1197fd",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d59g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d59g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x01404742adb501e0588ee27ca99c27e06076acc4f0712bb1f668b26a2401c7a4",
-                    "mixHash" : "0xf76f317841c098acb551ba87e865db9b30606f2e679bbd44d21f0ddc7f5254eb",
-                    "nonce" : "0xf9baa25e73a41273",
+                    "hash" : "0x8cbb69febc36b13b8bafbf132d0efcf7b582fc12bb479a97cf1fdb1912a3dcf9",
+                    "mixHash" : "0xa0ee9633e625488fe6fab42cf08f3af249b7843e207cb51c2854821f9b2ad581",
+                    "nonce" : "0xac3bc208b98de9d7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x97eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4df",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f76f317841c098acb551ba87e865db9b30606f2e679bbd44d21f0ddc7f5254eb88f9baa25e73a41273f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea097eb659b8b7a03811512e487443fa541e1a9c952619110dc7bc614869ba2f4dfa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a0ee9633e625488fe6fab42cf08f3af249b7843e207cb51c2854821f9b2ad58188ac3bc208b98de9d7f85ff85d800183061a8080830186a08e6001600160016001b860006000f31ca066311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aefa05f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01404742adb501e0588ee27ca99c27e06076acc4f0712bb1f668b26a2401c7a4",
+        "lastblockhash" : "0x8cbb69febc36b13b8bafbf132d0efcf7b582fc12bb479a97cf1fdb1912a3dcf9",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0.json
index 12cdc409a..b183a1e5e 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d5g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8de095e1c44748aa3f054f5fffd85b3538539fe11fe70813d950aaa76ac5a08f",
-                    "mixHash" : "0xe6306f443b93fdba1f8b5f5d1d36a2744c1c0bc1a3fd6f752fb3e74d657a07fa",
-                    "nonce" : "0x51156f036504c33a",
+                    "hash" : "0x5ebe4c43d41be2bada592877a72e5e7adfb65b71f726f644f142697325675317",
+                    "mixHash" : "0x5dc0e89c4cb1399843c4b4c6dcf59ed43d7ae34acdd2d4b824ef6db93db01026",
+                    "nonce" : "0xd7373ab761bc1878",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e6306f443b93fdba1f8b5f5d1d36a2744c1c0bc1a3fd6f752fb3e74d657a07fa8851156f036504c33af85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05dc0e89c4cb1399843c4b4c6dcf59ed43d7ae34acdd2d4b824ef6db93db0102688d7373ab761bc1878f85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8de095e1c44748aa3f054f5fffd85b3538539fe11fe70813d950aaa76ac5a08f",
+        "lastblockhash" : "0x5ebe4c43d41be2bada592877a72e5e7adfb65b71f726f644f142697325675317",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d5g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe72a05295708c9ccbe43996750b0b68d0a64777aaf6af8426f11c83f3d79c180",
-                    "mixHash" : "0xd48a09868f7b72c6aefcdd00916cab5ffcfcb2b1701409c8333a99a49611f964",
-                    "nonce" : "0x2b4fdd5237e97ee7",
+                    "hash" : "0x2ef7b3c751ea6d48c5047c1cde1d4ed3f1a97d2fe9cbf8d9749662ad01fcba50",
+                    "mixHash" : "0x24d330b7540cf9b423d252686ef766259617530e3befddce8eb985cfe65896a0",
+                    "nonce" : "0x86350c2f972323ad",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d48a09868f7b72c6aefcdd00916cab5ffcfcb2b1701409c8333a99a49611f964882b4fdd5237e97ee7f85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a024d330b7540cf9b423d252686ef766259617530e3befddce8eb985cfe65896a08886350c2f972323adf85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe72a05295708c9ccbe43996750b0b68d0a64777aaf6af8426f11c83f3d79c180",
+        "lastblockhash" : "0x2ef7b3c751ea6d48c5047c1cde1d4ed3f1a97d2fe9cbf8d9749662ad01fcba50",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d5g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd78fad7c8e0c6941575ad29c4b892a98c7af1e0ae842aea9c7302fe3fc98ea73",
-                    "mixHash" : "0x82c2f5ee02c85db25117ac7c1fd57ab8a0ad098c01cd2b9c80f387a03ef4300f",
-                    "nonce" : "0xafc6650f10e2b41a",
+                    "hash" : "0xc9c7c6978e83b007574f2af75b96b239bc20ab91f6431b70580a3243129ddb45",
+                    "mixHash" : "0x58d5d15eeb0a9b570946cae2a970de9d36dfc8d911005c3bc4cf985c985fff9c",
+                    "nonce" : "0xeee312f364a97000",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082c2f5ee02c85db25117ac7c1fd57ab8a0ad098c01cd2b9c80f387a03ef4300f88afc6650f10e2b41af85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a058d5d15eeb0a9b570946cae2a970de9d36dfc8d911005c3bc4cf985c985fff9c88eee312f364a97000f85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd78fad7c8e0c6941575ad29c4b892a98c7af1e0ae842aea9c7302fe3fc98ea73",
+        "lastblockhash" : "0xc9c7c6978e83b007574f2af75b96b239bc20ab91f6431b70580a3243129ddb45",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d5g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6a51b8e3f050ead69e4ad1173314c36a8f65582e8c313cece823eb4b1e38b98d",
-                    "mixHash" : "0xe0193606aa12a692599be28c84cf802aae9b9597e8d3af6691ceb89a71ba15a4",
-                    "nonce" : "0x7cd01c7cc7cfa96d",
+                    "hash" : "0x7cfc69f222093a1c4e6587e3621c9e105cb5d514b94858f6a92d9978c976db04",
+                    "mixHash" : "0x9d5bb3983bf858558699212fcc4a1ea88b753f01d779b0c333f24851c3f33429",
+                    "nonce" : "0xa89f1281a7641f2c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e0193606aa12a692599be28c84cf802aae9b9597e8d3af6691ceb89a71ba15a4887cd01c7cc7cfa96df85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09d5bb3983bf858558699212fcc4a1ea88b753f01d779b0c333f24851c3f3342988a89f1281a7641f2cf85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a51b8e3f050ead69e4ad1173314c36a8f65582e8c313cece823eb4b1e38b98d",
+        "lastblockhash" : "0x7cfc69f222093a1c4e6587e3621c9e105cb5d514b94858f6a92d9978c976db04",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d5g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xabb5d32552e833d759e912aa02af78532f5e3f77851c1c122746ee915bda33de",
-                    "mixHash" : "0x61923a56825ec3d8a5d022433a6c2347dd477f8e3acd6fb14f1c2c4e744767ba",
-                    "nonce" : "0x71f50fd943126f65",
+                    "hash" : "0x259c351280978cbaf79b67f83891c858e0cdb57c8eb5d7748e245befaa8f1d74",
+                    "mixHash" : "0xbb37693d18d8a2959856ff95dec7ec19e7b99cd8f55ab6c61c37d681531c7e4e",
+                    "nonce" : "0x42585888cec37430",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a061923a56825ec3d8a5d022433a6c2347dd477f8e3acd6fb14f1c2c4e744767ba8871f50fd943126f65f85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb37693d18d8a2959856ff95dec7ec19e7b99cd8f55ab6c61c37d681531c7e4e8842585888cec37430f85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabb5d32552e833d759e912aa02af78532f5e3f77851c1c122746ee915bda33de",
+        "lastblockhash" : "0x259c351280978cbaf79b67f83891c858e0cdb57c8eb5d7748e245befaa8f1d74",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d5g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d5g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd0372a68e9eb11575b7d16b905f11ba116567066b5d2452b46087559056abaf2",
-                    "mixHash" : "0x17f57ee64a77d34dad7ed720c5c0a4c3006378015564a7d1d5249260a350eeae",
-                    "nonce" : "0x4a253ca1e16a6baa",
+                    "hash" : "0x3eb3eb74d62c07c4ae5e297642d9ac04e7f6a202d0418180847d0eb17c96bcb6",
+                    "mixHash" : "0xbfb138d3ec3f5e35a200bc2533e28f8b5f7c80297e30f689b0b9c3beba00cb90",
+                    "nonce" : "0xcea1771fc876b94b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xeacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017f57ee64a77d34dad7ed720c5c0a4c3006378015564a7d1d5249260a350eeae884a253ca1e16a6baaf85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0eacdd9b514a164ead5e6a80560638582066a28cc8adf4d8f6a72662c1988541fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bfb138d3ec3f5e35a200bc2533e28f8b5f7c80297e30f689b0b9c3beba00cb9088cea1771fc876b94bf85ff85d800183061a8080830186a08e60016001600160011b60006000f31ba0cb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3ea0350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011b60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0372a68e9eb11575b7d16b905f11ba116567066b5d2452b46087559056abaf2",
+        "lastblockhash" : "0x3eb3eb74d62c07c4ae5e297642d9ac04e7f6a202d0418180847d0eb17c96bcb6",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0.json
index 7335079f4..e2883e7f3 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d60g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x71dbcc36793d17d6bcfd0045282ce6e7ea4df742fac104870ce468312c8c3623",
-                    "mixHash" : "0xca0ea66399e569c734628103b92c3be31fd6323aff3facd953f233430b3c69a7",
-                    "nonce" : "0x25caa29d4826eecd",
+                    "hash" : "0x82313ef11252da56cf7990503446350c8efbd33313458141cdf8cb4e8f4ed952",
+                    "mixHash" : "0x0234ec2a67898849badf1b86a014792b0012be999b53fa19de00f12b1fc9e7ed",
+                    "nonce" : "0x445202af83eb131c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ca0ea66399e569c734628103b92c3be31fd6323aff3facd953f233430b3c69a78825caa29d4826eecdf85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00234ec2a67898849badf1b86a014792b0012be999b53fa19de00f12b1fc9e7ed88445202af83eb131cf85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71dbcc36793d17d6bcfd0045282ce6e7ea4df742fac104870ce468312c8c3623",
+        "lastblockhash" : "0x82313ef11252da56cf7990503446350c8efbd33313458141cdf8cb4e8f4ed952",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d60g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2f6aa7d8ce96a3d64c2954ef5283e8182f1f306ea5b6558248cc3d659f602b52",
-                    "mixHash" : "0x1d6e7bd8731c6ae9edcc09ee731a0b152474d44f309b46df97bd2d62b3dd19f1",
-                    "nonce" : "0x2b6d92f272321f9c",
+                    "hash" : "0xaf08d132ab3024837ffc2a5951346951c5b2af4c3079a4a8802b2c1426e77e60",
+                    "mixHash" : "0xbf87ded39b907e9fa215de04aee6de7c5fcb6a5380d02d96e546b4a15092264b",
+                    "nonce" : "0xa054412c4c7875a6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d6e7bd8731c6ae9edcc09ee731a0b152474d44f309b46df97bd2d62b3dd19f1882b6d92f272321f9cf85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bf87ded39b907e9fa215de04aee6de7c5fcb6a5380d02d96e546b4a15092264b88a054412c4c7875a6f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f6aa7d8ce96a3d64c2954ef5283e8182f1f306ea5b6558248cc3d659f602b52",
+        "lastblockhash" : "0xaf08d132ab3024837ffc2a5951346951c5b2af4c3079a4a8802b2c1426e77e60",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d60g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0d3dbddfc976deb63cbc55cd5ba33ee86077cea752fee1de2bff573a27d57144",
-                    "mixHash" : "0xf32613e35dce65b91897b3b79207cff382382205653583b8314b4ec4ab586aa8",
-                    "nonce" : "0x78b3296a141aa5f3",
+                    "hash" : "0x897f6e083145e3016ff52a143c3c9edb1290786b721a5adc5f69be5a975ec389",
+                    "mixHash" : "0xc525835a37a43a0e2588b518c75cf3a49a3a2a7af424ac44c34499342865ac93",
+                    "nonce" : "0x85be32489464075d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f32613e35dce65b91897b3b79207cff382382205653583b8314b4ec4ab586aa88878b3296a141aa5f3f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c525835a37a43a0e2588b518c75cf3a49a3a2a7af424ac44c34499342865ac938885be32489464075df85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d3dbddfc976deb63cbc55cd5ba33ee86077cea752fee1de2bff573a27d57144",
+        "lastblockhash" : "0x897f6e083145e3016ff52a143c3c9edb1290786b721a5adc5f69be5a975ec389",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d60g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x911a656050c57428ee24d0d155306e4405d1461113876d1b90d99f95a611eff2",
-                    "mixHash" : "0xe2ca11e10d2fb9c208c6986ca7765a6719c7fab62aee6dcc917348468517a4a9",
-                    "nonce" : "0xf5612a0832484125",
+                    "hash" : "0x27c8819ccc7bb821bdea36f596967c2726164a2046bb18c3aa27fe7d06a4d052",
+                    "mixHash" : "0x52f4f6a766897e975f5596712958323484562c316c53cce2531e4647988d3594",
+                    "nonce" : "0xa07f46739f6106fd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e2ca11e10d2fb9c208c6986ca7765a6719c7fab62aee6dcc917348468517a4a988f5612a0832484125f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052f4f6a766897e975f5596712958323484562c316c53cce2531e4647988d359488a07f46739f6106fdf85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x911a656050c57428ee24d0d155306e4405d1461113876d1b90d99f95a611eff2",
+        "lastblockhash" : "0x27c8819ccc7bb821bdea36f596967c2726164a2046bb18c3aa27fe7d06a4d052",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d60g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x05efb579099318435f76634a3a8f25f6f7207ef35fd50165c0cd0ed432ff52d7",
-                    "mixHash" : "0x68691c51c849c50821ab4a3a618ee570016b76ea812a04d5ed1a31a2b56c4343",
-                    "nonce" : "0x75a127624967174c",
+                    "hash" : "0x825b6a53de0546f7fcdc05819ae4d393813b187b05fbd709615e51c93f285ea4",
+                    "mixHash" : "0x5565748fe1ef7380a781cbec22134d6ccf59f4005089ea8f0aee312bc7bf37d8",
+                    "nonce" : "0x3392f675968121c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a068691c51c849c50821ab4a3a618ee570016b76ea812a04d5ed1a31a2b56c43438875a127624967174cf85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05565748fe1ef7380a781cbec22134d6ccf59f4005089ea8f0aee312bc7bf37d8883392f675968121c0f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05efb579099318435f76634a3a8f25f6f7207ef35fd50165c0cd0ed432ff52d7",
+        "lastblockhash" : "0x825b6a53de0546f7fcdc05819ae4d393813b187b05fbd709615e51c93f285ea4",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d60g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d60g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa9368df90e853c023ec467d1819bbe09af457de8f71e1d95cc6881bdc627345b",
-                    "mixHash" : "0xbaa7273f215d1f423eaec761a1c762762eb99573d9e2ab7f24c9f83d27ba52b2",
-                    "nonce" : "0xf0d2c28a8c590a52",
+                    "hash" : "0x864ac2ecefe88ff582ec3f5859410ed9dcf4414deb93b57d5ebce408c908ac18",
+                    "mixHash" : "0x06535528b13b375f0f59fae555460f13ce39a611852253866589e62f5f50dc43",
+                    "nonce" : "0x3627fd755ca77577",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0baa7273f215d1f423eaec761a1c762762eb99573d9e2ab7f24c9f83d27ba52b288f0d2c28a8c590a52f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0182f1cc25a25f6f44a2f8b7c82d2af7b8458efac0914028058e169bdcdc9580ca054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a006535528b13b375f0f59fae555460f13ce39a611852253866589e62f5f50dc43883627fd755ca77577f85ff85d800183061a8080830186a08e6001600160016001b960006000f31ca0105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0fa047ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001b960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9368df90e853c023ec467d1819bbe09af457de8f71e1d95cc6881bdc627345b",
+        "lastblockhash" : "0x864ac2ecefe88ff582ec3f5859410ed9dcf4414deb93b57d5ebce408c908ac18",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0.json
index 703fc53c8..ceb87ddf2 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d61g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc57bf5fa3a4cb92fa480ac8d31cd939e1d46f9ed3417b92e1865650b4d7895c4",
-                    "mixHash" : "0xdc7444a0d72d219e4178bc11cf430553df67855a9bfda9b93b36a94d280aecb3",
-                    "nonce" : "0x3d9ceaba11935570",
+                    "hash" : "0x934187dbf5e1554980df5ca4df5325edd2ba5393e1b5dbc26fc0a0427857dcd1",
+                    "mixHash" : "0xdedcbcda5cb8f532680c010d70fc4d8c36d4e193e90b91504d56eafdd8a9e521",
+                    "nonce" : "0x3d7c7a53717be503",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dc7444a0d72d219e4178bc11cf430553df67855a9bfda9b93b36a94d280aecb3883d9ceaba11935570f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dedcbcda5cb8f532680c010d70fc4d8c36d4e193e90b91504d56eafdd8a9e521883d7c7a53717be503f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc57bf5fa3a4cb92fa480ac8d31cd939e1d46f9ed3417b92e1865650b4d7895c4",
+        "lastblockhash" : "0x934187dbf5e1554980df5ca4df5325edd2ba5393e1b5dbc26fc0a0427857dcd1",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d61g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd0024e5992ac1d4b03a9c6681ecce45a07ff3c4b2f9e0c9aef2fb9f8d9a2c071",
-                    "mixHash" : "0x27fce8247f8d3f637e47a710964ffad140223df600f23d3e374bbeb29d025406",
-                    "nonce" : "0x5d45328a304ef883",
+                    "hash" : "0xbeea869a9c579e0af93c5158e931eaeff7c14c250ed4b7832891e1c78a807fd1",
+                    "mixHash" : "0x223f5f6a267ffd30984c1964d3c1542160c6559eeeeb2dbcb7f9bf626869d5ca",
+                    "nonce" : "0x2aa47a14e2636037",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a027fce8247f8d3f637e47a710964ffad140223df600f23d3e374bbeb29d025406885d45328a304ef883f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0223f5f6a267ffd30984c1964d3c1542160c6559eeeeb2dbcb7f9bf626869d5ca882aa47a14e2636037f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0024e5992ac1d4b03a9c6681ecce45a07ff3c4b2f9e0c9aef2fb9f8d9a2c071",
+        "lastblockhash" : "0xbeea869a9c579e0af93c5158e931eaeff7c14c250ed4b7832891e1c78a807fd1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d61g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf05ece1ac6a4995a957fe555c83ed4a8ac88c9e32793eb0cfe92ae4c4ee48dbc",
-                    "mixHash" : "0x14003d6f07234bb5c840323b845493c40d8eee14a31df5e747174cf6dce80939",
-                    "nonce" : "0x7c30877f5af1fad5",
+                    "hash" : "0xf65eb971f1326ccbae2ec1449ac4a6313451116930afb6ea480f8abcbcacdb40",
+                    "mixHash" : "0x2c2e4e70eb51237eed57a988f89bdcd8ebb59277685e3fc76e06495d9ce5ceb1",
+                    "nonce" : "0xb71d55d7fc5074bc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a014003d6f07234bb5c840323b845493c40d8eee14a31df5e747174cf6dce80939887c30877f5af1fad5f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c2e4e70eb51237eed57a988f89bdcd8ebb59277685e3fc76e06495d9ce5ceb188b71d55d7fc5074bcf85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf05ece1ac6a4995a957fe555c83ed4a8ac88c9e32793eb0cfe92ae4c4ee48dbc",
+        "lastblockhash" : "0xf65eb971f1326ccbae2ec1449ac4a6313451116930afb6ea480f8abcbcacdb40",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d61g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x017d920dbabcf3b7cc97dafee10d98ba8144997c4d7ca4dda74f0c063a819799",
-                    "mixHash" : "0x8368024326ba1a9a343c501739f26405e43144b4068820d6b2db5c1d9eed2525",
-                    "nonce" : "0xbb476a6365073888",
+                    "hash" : "0xb9e624fe3cc868554d3a83eb7203ad59860531c69f5f25520f0fa5e770a25235",
+                    "mixHash" : "0xdf5d10f1371fc0bc0c33899df4cd7096bdd1b5d7d0b5a29150db3726886fb592",
+                    "nonce" : "0x67c6ad97ff25af56",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08368024326ba1a9a343c501739f26405e43144b4068820d6b2db5c1d9eed252588bb476a6365073888f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0df5d10f1371fc0bc0c33899df4cd7096bdd1b5d7d0b5a29150db3726886fb5928867c6ad97ff25af56f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x017d920dbabcf3b7cc97dafee10d98ba8144997c4d7ca4dda74f0c063a819799",
+        "lastblockhash" : "0xb9e624fe3cc868554d3a83eb7203ad59860531c69f5f25520f0fa5e770a25235",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d61g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb98a9d80b78d1a5400ef8744ed8050574ae861b322b0bb5f10c248e4f2d92798",
-                    "mixHash" : "0x96c87f9ffd75563aeabe98ef62ad7347a5805d0fca77c75742cf97f5433b063c",
-                    "nonce" : "0xa24d6cbe0ea726b8",
+                    "hash" : "0xbe708d9800067c48397f2664d4154b3a5ed34ba29f56455997b2556232ae9861",
+                    "mixHash" : "0xc77fcadfb36ca32f8472bb520450770da70f166a058b4c0e99fb776936905cdc",
+                    "nonce" : "0x045dfd15bb8841d8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a096c87f9ffd75563aeabe98ef62ad7347a5805d0fca77c75742cf97f5433b063c88a24d6cbe0ea726b8f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c77fcadfb36ca32f8472bb520450770da70f166a058b4c0e99fb776936905cdc88045dfd15bb8841d8f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb98a9d80b78d1a5400ef8744ed8050574ae861b322b0bb5f10c248e4f2d92798",
+        "lastblockhash" : "0xbe708d9800067c48397f2664d4154b3a5ed34ba29f56455997b2556232ae9861",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d61g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d61g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b127a90bf30edbf9c2a30c1d997f8483f17cffe99c7d889d1c8be116324bc8e",
-                    "mixHash" : "0x055eb04c161462c72c6cad1547495745eee6c60c7d02d90038ca3e1e55fea40f",
-                    "nonce" : "0x14f9496b01dc028d",
+                    "hash" : "0xb77ff1d78faacda335fd669c4b1d561e3d9c77e96297f1e9bc52e4875f3a8d03",
+                    "mixHash" : "0x180e78b6ef3e8bc280ed058ff05254a1ebd7d9d52544c6530fc9881262c3082a",
+                    "nonce" : "0x6f3da58da15a4ad3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0055eb04c161462c72c6cad1547495745eee6c60c7d02d90038ca3e1e55fea40f8814f9496b01dc028df85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03665b8466a1db6237cd32a892e03c4922396094aa7741009d7da5920cc60c207a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0180e78b6ef3e8bc280ed058ff05254a1ebd7d9d52544c6530fc9881262c3082a886f3da58da15a4ad3f85ff85d800183061a8080830186a08e6001600160016001ba60006000f31ca0945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1a016172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ba60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b127a90bf30edbf9c2a30c1d997f8483f17cffe99c7d889d1c8be116324bc8e",
+        "lastblockhash" : "0xb77ff1d78faacda335fd669c4b1d561e3d9c77e96297f1e9bc52e4875f3a8d03",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0.json
index b97fe527c..0e32f5bc7 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d62g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0e5169b45caf814f0c01c946d7a0091e4acd18b37dba2379e23df40fb663fca8",
-                    "mixHash" : "0x721cc4196f09326ce19036f08f416f24ef8464010569f1430f507fae349dbee7",
-                    "nonce" : "0xda70d987cbdebb87",
+                    "hash" : "0xe9991053e865955aa1c1c14d96673470c71f7cf54d8466de65f9163a990d80f9",
+                    "mixHash" : "0x74a00414f2da2b9f9ceb2659a5a170ad92edaed187a91b93588d897d12f63123",
+                    "nonce" : "0x05bd6b2e11d9c02c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0721cc4196f09326ce19036f08f416f24ef8464010569f1430f507fae349dbee788da70d987cbdebb87f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a074a00414f2da2b9f9ceb2659a5a170ad92edaed187a91b93588d897d12f631238805bd6b2e11d9c02cf85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e5169b45caf814f0c01c946d7a0091e4acd18b37dba2379e23df40fb663fca8",
+        "lastblockhash" : "0xe9991053e865955aa1c1c14d96673470c71f7cf54d8466de65f9163a990d80f9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d62g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x058e14dae486eda689531b4a0d6d8a5512cfa96a7e14882c2b6bccb576e28209",
-                    "mixHash" : "0x45992bb2bee5c892765d6c2a2b0e86fbbf928216de2a1417018fd87bef05c22e",
-                    "nonce" : "0xe0f369d94826f02b",
+                    "hash" : "0x600f39d4eafc48db6529fad059a381f508ddd1de5bd5c02d453d372b827a68ab",
+                    "mixHash" : "0x385c7ff5f750e6e6831b94a24c0bf9e2aff337bf3cd1d52fd491d048dffabec4",
+                    "nonce" : "0x4a46632481fd070f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a045992bb2bee5c892765d6c2a2b0e86fbbf928216de2a1417018fd87bef05c22e88e0f369d94826f02bf85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0385c7ff5f750e6e6831b94a24c0bf9e2aff337bf3cd1d52fd491d048dffabec4884a46632481fd070ff85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x058e14dae486eda689531b4a0d6d8a5512cfa96a7e14882c2b6bccb576e28209",
+        "lastblockhash" : "0x600f39d4eafc48db6529fad059a381f508ddd1de5bd5c02d453d372b827a68ab",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d62g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf3c2d5f169422104c038823953b62e2d3170496ef5b78adf573fa682f1845c42",
-                    "mixHash" : "0x2d10558a996bdb549ff9323c8febd57cbfd75791a12b5791c56f560e4e66ff41",
-                    "nonce" : "0x89fc5ac32a020a93",
+                    "hash" : "0xe6f6dbe2ff53e096bcab312b9789b3160d1e6665366bb08b51c27da7e69efc19",
+                    "mixHash" : "0xcf24f09d370c486b93f412eba5ebc6eda65bf52b24acbc21e22a89bba00819d0",
+                    "nonce" : "0xaff49267e8d598b9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d10558a996bdb549ff9323c8febd57cbfd75791a12b5791c56f560e4e66ff418889fc5ac32a020a93f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cf24f09d370c486b93f412eba5ebc6eda65bf52b24acbc21e22a89bba00819d088aff49267e8d598b9f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3c2d5f169422104c038823953b62e2d3170496ef5b78adf573fa682f1845c42",
+        "lastblockhash" : "0xe6f6dbe2ff53e096bcab312b9789b3160d1e6665366bb08b51c27da7e69efc19",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d62g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdd12aac7f83bedcf9c64963f367cd73a6c13f20207669031bb241ea2e09dcae8",
-                    "mixHash" : "0x132025c84149f01ec875207457cbfd9c38457c99c98d537af1d0bf65b57b174a",
-                    "nonce" : "0x4a85e19ac7cce44e",
+                    "hash" : "0x7c5acdf0f5bc5f6c7ad18755d98aa2729b4a8fb20e926272a8ae61d1a1fd27e7",
+                    "mixHash" : "0xcbf47c405a8d625278c332562413142ba1799f5b6d5845f0e50d9b64d6cecb04",
+                    "nonce" : "0x3d195ad20b6de591",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0132025c84149f01ec875207457cbfd9c38457c99c98d537af1d0bf65b57b174a884a85e19ac7cce44ef85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cbf47c405a8d625278c332562413142ba1799f5b6d5845f0e50d9b64d6cecb04883d195ad20b6de591f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd12aac7f83bedcf9c64963f367cd73a6c13f20207669031bb241ea2e09dcae8",
+        "lastblockhash" : "0x7c5acdf0f5bc5f6c7ad18755d98aa2729b4a8fb20e926272a8ae61d1a1fd27e7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d62g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4c0ea0d1232dd4a7f4cbddd025e95935795b50f24b80eca9979d1442e2289be8",
-                    "mixHash" : "0xf6dbee879991c06c7778a0823e14eb4ab9ec606e8804783a9ccf6961a58e797c",
-                    "nonce" : "0x214b4f6ccc30a337",
+                    "hash" : "0x1ddcabb5f049a5674a0515e5b0f3204776ecb02727275def8dff929821bc5baf",
+                    "mixHash" : "0x3ceb24cb0779eff41b9655b2a5ba22b9b4f9475f33530af6bf25290d823721df",
+                    "nonce" : "0xf6a50d3675a89980",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f6dbee879991c06c7778a0823e14eb4ab9ec606e8804783a9ccf6961a58e797c88214b4f6ccc30a337f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ceb24cb0779eff41b9655b2a5ba22b9b4f9475f33530af6bf25290d823721df88f6a50d3675a89980f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c0ea0d1232dd4a7f4cbddd025e95935795b50f24b80eca9979d1442e2289be8",
+        "lastblockhash" : "0x1ddcabb5f049a5674a0515e5b0f3204776ecb02727275def8dff929821bc5baf",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d62g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d62g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9594e064ebb04f0dc89d69114ee7a34ebe6d3f5862c12e8af0c68ea88cd76bd6",
-                    "mixHash" : "0x5168fde917ac38908fc1da9fdc07b16183a391c7209a4d46252376b81f616314",
-                    "nonce" : "0x102c88a2d8ecd34a",
+                    "hash" : "0x2598dc61fc23f32af1bb4aa75b94fd65c44b88bd51a174cb0bbacda01999fadd",
+                    "mixHash" : "0xe1f2303d554d7cc2ef2ecf0a07df35830a830585a0192717b9787b0e913d496d",
+                    "nonce" : "0xbb7c8963262ede96",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x1d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05168fde917ac38908fc1da9fdc07b16183a391c7209a4d46252376b81f61631488102c88a2d8ecd34af85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea01d31b71631f995d37fd0bc021b6f4995d770e507758b91a9de12bc1f0ce1903fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e1f2303d554d7cc2ef2ecf0a07df35830a830585a0192717b9787b0e913d496d88bb7c8963262ede96f85ff85d800183061a8080830186a08e6001600160016001bb60006000f31ca049957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2ca064dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bb60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9594e064ebb04f0dc89d69114ee7a34ebe6d3f5862c12e8af0c68ea88cd76bd6",
+        "lastblockhash" : "0x2598dc61fc23f32af1bb4aa75b94fd65c44b88bd51a174cb0bbacda01999fadd",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0.json
index 966b7348d..abaf9aacb 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d63g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x70857f832177aee8ddc2f71061b8ecab4293326e7b65ee499b72a4241edfab18",
-                    "mixHash" : "0x35660c1ce87f4d98d330d7a31a533a7e198a77a7b3e5fe990f92e6174e2547ff",
-                    "nonce" : "0xc131919da18fc0e4",
+                    "hash" : "0xd8028c31d3b8cdb6ed762e029c4d20c61ccbaaf09f55ee4eeeb32d9fd92fb5cf",
+                    "mixHash" : "0xfc7411d0d51ab9efce981c6fc082fc62f7a6d2a42edb75210c9ea63085f5ffd4",
+                    "nonce" : "0x06a237fdf0693243",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a035660c1ce87f4d98d330d7a31a533a7e198a77a7b3e5fe990f92e6174e2547ff88c131919da18fc0e4f85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fc7411d0d51ab9efce981c6fc082fc62f7a6d2a42edb75210c9ea63085f5ffd48806a237fdf0693243f85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70857f832177aee8ddc2f71061b8ecab4293326e7b65ee499b72a4241edfab18",
+        "lastblockhash" : "0xd8028c31d3b8cdb6ed762e029c4d20c61ccbaaf09f55ee4eeeb32d9fd92fb5cf",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d63g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x13b2e98521b24159981aec1d2c144787ffb0419a31a7a816ed933bcb8c5e8abc",
-                    "mixHash" : "0x7bad9696c154b17c6e138b42eb94e4cc67a17d4f80c118957da9679dc96b0716",
-                    "nonce" : "0x520cab577d1b38bf",
+                    "hash" : "0xc155d24fda8598f4b516a55573d84302ba349adc551c1d18e9adf0bbfc5794d9",
+                    "mixHash" : "0xa7449b3d25fdc05ae6a4066ff72e09fe2b755c11020a4173cdf152637fefd815",
+                    "nonce" : "0xfd24b02a22506ecf",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07bad9696c154b17c6e138b42eb94e4cc67a17d4f80c118957da9679dc96b071688520cab577d1b38bff85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a7449b3d25fdc05ae6a4066ff72e09fe2b755c11020a4173cdf152637fefd81588fd24b02a22506ecff85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13b2e98521b24159981aec1d2c144787ffb0419a31a7a816ed933bcb8c5e8abc",
+        "lastblockhash" : "0xc155d24fda8598f4b516a55573d84302ba349adc551c1d18e9adf0bbfc5794d9",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d63g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc6d80c04f74aeb1d0acfa808d5ea0da3b34a0d96ee58d807ed2cf6591c84f715",
-                    "mixHash" : "0x1f5367f01eb6661922a62919b7c8c6f9a379364f309a6bcc57d8937bfeb561ad",
-                    "nonce" : "0xea0a07cfd103eab3",
+                    "hash" : "0xcdf95de2430aa92f44c123aa0dc5fce70ab95eba9c73bc2b9abaf6f5b4ce8dc0",
+                    "mixHash" : "0x9fc31ab750c1ae098e308862b60d8e85a2f104a280f9b7f757806d4c2e28d8cc",
+                    "nonce" : "0x63dadabbd8a2370b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f5367f01eb6661922a62919b7c8c6f9a379364f309a6bcc57d8937bfeb561ad88ea0a07cfd103eab3f85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09fc31ab750c1ae098e308862b60d8e85a2f104a280f9b7f757806d4c2e28d8cc8863dadabbd8a2370bf85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6d80c04f74aeb1d0acfa808d5ea0da3b34a0d96ee58d807ed2cf6591c84f715",
+        "lastblockhash" : "0xcdf95de2430aa92f44c123aa0dc5fce70ab95eba9c73bc2b9abaf6f5b4ce8dc0",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d63g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfd3c21c6bc70847e0eaeba8e7db7204349ef6cce25eb1b405996d2b963f31a2a",
-                    "mixHash" : "0x312fa894e7524d8709af852cff862c14f518410789b260198125b5deca4a538f",
-                    "nonce" : "0xcb7d2d2c25b846da",
+                    "hash" : "0x2109cf2c47f643ad44c0534576368a1ac4a4ecda6712f96bb11063814efc4358",
+                    "mixHash" : "0xcdf5d77eda8fc35c31adda150ad20e38473228accd2572d301ffcde705830808",
+                    "nonce" : "0x4c03867fd490b182",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0312fa894e7524d8709af852cff862c14f518410789b260198125b5deca4a538f88cb7d2d2c25b846daf85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cdf5d77eda8fc35c31adda150ad20e38473228accd2572d301ffcde705830808884c03867fd490b182f85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd3c21c6bc70847e0eaeba8e7db7204349ef6cce25eb1b405996d2b963f31a2a",
+        "lastblockhash" : "0x2109cf2c47f643ad44c0534576368a1ac4a4ecda6712f96bb11063814efc4358",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d63g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6eae541470463d84bf4b62064d19ff3f5f5f7f753a745216e3726e90c26fd029",
-                    "mixHash" : "0xb63d47b1820331d4310b23413cd18d6400b6aa73abc664ea9c289c154656b07b",
-                    "nonce" : "0x6a1596e424f123eb",
+                    "hash" : "0xa35e1961787c207ce3f72eecef07aece278a0935970c61c40f3b3c1c94108607",
+                    "mixHash" : "0x8b6b3323d71f8add12084af9bdec5690a3a9ee1ca3bbe6b5f9ce9398a6e953ba",
+                    "nonce" : "0xdfd42b427a4f9f1f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b63d47b1820331d4310b23413cd18d6400b6aa73abc664ea9c289c154656b07b886a1596e424f123ebf85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08b6b3323d71f8add12084af9bdec5690a3a9ee1ca3bbe6b5f9ce9398a6e953ba88dfd42b427a4f9f1ff85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6eae541470463d84bf4b62064d19ff3f5f5f7f753a745216e3726e90c26fd029",
+        "lastblockhash" : "0xa35e1961787c207ce3f72eecef07aece278a0935970c61c40f3b3c1c94108607",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d63g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d63g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7d5d0c962469163d777a6283517dc9a0636bf24393ba6d8e83dd47831a57c0c7",
-                    "mixHash" : "0x0d6cde69f4c68be9712f3bc760ae47253483735ee4bb8c180a6ea27a3e18defa",
-                    "nonce" : "0x734941e707cb213d",
+                    "hash" : "0xb23c5ac113ee0dc7de4bdbf4db2f491e8bdad0d4a69e15cbc729822be8ec848f",
+                    "mixHash" : "0x94fade13a7d274abad6a245ba745485a59ab59a9896dcf40cdbe75208fec8a23",
+                    "nonce" : "0xc2fd82bff3dbf8b8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xf45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d6cde69f4c68be9712f3bc760ae47253483735ee4bb8c180a6ea27a3e18defa88734941e707cb213df85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0f45c00dc2ae35af86a498a9a8cc7ff2179a59d8451c4a8fa00eeb7a74f11205ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a094fade13a7d274abad6a245ba745485a59ab59a9896dcf40cdbe75208fec8a2388c2fd82bff3dbf8b8f85ff85d800183061a8080830186a08e6001600160016001bc60006000f31ca0975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5a058f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bc60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5d0c962469163d777a6283517dc9a0636bf24393ba6d8e83dd47831a57c0c7",
+        "lastblockhash" : "0xb23c5ac113ee0dc7de4bdbf4db2f491e8bdad0d4a69e15cbc729822be8ec848f",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0.json
index 2d91278d6..a86632d90 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d64g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd80a925b73abbf46914dee5ca6d7f2b29400a3023ea41cd0f4781ae039fa8bb2",
-                    "mixHash" : "0x548a0027a3e428ecb5755126e11b96ce223dfb28920d7893ce3bfe21dc0b638a",
-                    "nonce" : "0x74d42a86a91f6aa6",
+                    "hash" : "0x8a3f0dc4659a315c4d99346d02c442296de971212e157a2d283ecc62732f9002",
+                    "mixHash" : "0xa3ecb9811cf818c2313cad87bcba04f627792de2bacf82e7d399784c45a82c8a",
+                    "nonce" : "0x2241512bc198c02c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0548a0027a3e428ecb5755126e11b96ce223dfb28920d7893ce3bfe21dc0b638a8874d42a86a91f6aa6f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a3ecb9811cf818c2313cad87bcba04f627792de2bacf82e7d399784c45a82c8a882241512bc198c02cf85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd80a925b73abbf46914dee5ca6d7f2b29400a3023ea41cd0f4781ae039fa8bb2",
+        "lastblockhash" : "0x8a3f0dc4659a315c4d99346d02c442296de971212e157a2d283ecc62732f9002",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d64g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2e8bcdd856ca003f40e69c36b287714bbb1a068613500bb1dc838ec4d35b0b2b",
-                    "mixHash" : "0xe7810586e9d4d2d4962c72b2cec626910dfa9c56cb8fee2b9de09bb576e607e3",
-                    "nonce" : "0xbc6722cf14be1b08",
+                    "hash" : "0x1518e38a79f79a76e5afcfff3b27fb8beb5d311aba1195e060be2d96129e83cb",
+                    "mixHash" : "0xecf09a2532c2759a3ca15eecc594e3355916e8d3af9951b3fbc29f936006c4de",
+                    "nonce" : "0xd15e306636abc364",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e7810586e9d4d2d4962c72b2cec626910dfa9c56cb8fee2b9de09bb576e607e388bc6722cf14be1b08f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ecf09a2532c2759a3ca15eecc594e3355916e8d3af9951b3fbc29f936006c4de88d15e306636abc364f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e8bcdd856ca003f40e69c36b287714bbb1a068613500bb1dc838ec4d35b0b2b",
+        "lastblockhash" : "0x1518e38a79f79a76e5afcfff3b27fb8beb5d311aba1195e060be2d96129e83cb",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d64g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x81cc5deb1d308450c7520c86a76fbf6b46efcb0f3caac586c43b019f4f31db64",
-                    "mixHash" : "0x13b82dd99c2d9432f4a72a8821cd2f6319c662a1ef23902b2381e679676df652",
-                    "nonce" : "0x52cbf5eb93fd0b44",
+                    "hash" : "0x0fb7ecc212a7809b0f0ae90eff5c3a69f2bb54dd8689ecdf8618ac25092107df",
+                    "mixHash" : "0x4493f8c9fb90c64196318d0c9fc15e5876052653ba40403e6b9790fbb61d363a",
+                    "nonce" : "0xda0f552010f0258d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a013b82dd99c2d9432f4a72a8821cd2f6319c662a1ef23902b2381e679676df6528852cbf5eb93fd0b44f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04493f8c9fb90c64196318d0c9fc15e5876052653ba40403e6b9790fbb61d363a88da0f552010f0258df85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81cc5deb1d308450c7520c86a76fbf6b46efcb0f3caac586c43b019f4f31db64",
+        "lastblockhash" : "0x0fb7ecc212a7809b0f0ae90eff5c3a69f2bb54dd8689ecdf8618ac25092107df",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d64g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x889ad0c3b62eff54a0cbee025e15f2142bdf4529367e2d6b0d01679778d22b85",
-                    "mixHash" : "0xffa2ae7da1eedf3d43d8ba5a0f5097ec9bf9bf0aaf21967f38c996a2b32e5bac",
-                    "nonce" : "0x1085510acad2c186",
+                    "hash" : "0x188099cc963eb8cfd04c1da0ecde16ef81daf2c17024325f0b58cf7e93a718a7",
+                    "mixHash" : "0x030d355865fe23efcee8950dbde769a4967f1ac11affd1748345b4c48736aad6",
+                    "nonce" : "0x5d8f30b887496175",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffa2ae7da1eedf3d43d8ba5a0f5097ec9bf9bf0aaf21967f38c996a2b32e5bac881085510acad2c186f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0030d355865fe23efcee8950dbde769a4967f1ac11affd1748345b4c48736aad6885d8f30b887496175f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x889ad0c3b62eff54a0cbee025e15f2142bdf4529367e2d6b0d01679778d22b85",
+        "lastblockhash" : "0x188099cc963eb8cfd04c1da0ecde16ef81daf2c17024325f0b58cf7e93a718a7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d64g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x43528832c013d715d848ebc4a117bbd2e9836d3bf3324fa1282f285ca05962ed",
-                    "mixHash" : "0xa8f6293e0e66c1e0dfe106f1dd3651acaa98d2ad052e7f6128ea763f0d1fe5c2",
-                    "nonce" : "0x1568555258fa80a3",
+                    "hash" : "0xa4873aa12c0edb56e52aa41297f63022730038ec82c1530e31cf615440f789c1",
+                    "mixHash" : "0x16ff1c6318c89c0926fb7b3d69d6530e7513d3be6f44a71493cd00760f567b83",
+                    "nonce" : "0x043c691587e4e65f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a8f6293e0e66c1e0dfe106f1dd3651acaa98d2ad052e7f6128ea763f0d1fe5c2881568555258fa80a3f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a016ff1c6318c89c0926fb7b3d69d6530e7513d3be6f44a71493cd00760f567b8388043c691587e4e65ff85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43528832c013d715d848ebc4a117bbd2e9836d3bf3324fa1282f285ca05962ed",
+        "lastblockhash" : "0xa4873aa12c0edb56e52aa41297f63022730038ec82c1530e31cf615440f789c1",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d64g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d64g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x370c4a189ecd5d52093ae2671e3064f5c48dee2af9a189ed53916d46baacd0e8",
-                    "mixHash" : "0x502e3d502cec9883ee4ccde25103cccdba3438967d814766e8a1d70675da8d09",
-                    "nonce" : "0xd8c841b20f982be8",
+                    "hash" : "0xf6432486079f752bff71d4aeab518553dcb30f68ddceaab71e64ba67054421f8",
+                    "mixHash" : "0x950941d518b0cd43fb32523bc38447c85a06926bd5feff6c3d67478056ed1311",
+                    "nonce" : "0x181f1ee65865ed65",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x78800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0502e3d502cec9883ee4ccde25103cccdba3438967d814766e8a1d70675da8d0988d8c841b20f982be8f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea078800ba43c121c3eb51dcf77210b8111d18cc60073f9fdee1919d8e4a6afaf13a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0950941d518b0cd43fb32523bc38447c85a06926bd5feff6c3d67478056ed131188181f1ee65865ed65f85ff85d800183061a8080830186a08e6001600160016001bd60006000f31ca07029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017a03ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bd60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x370c4a189ecd5d52093ae2671e3064f5c48dee2af9a189ed53916d46baacd0e8",
+        "lastblockhash" : "0xf6432486079f752bff71d4aeab518553dcb30f68ddceaab71e64ba67054421f8",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0.json
index 22c7695c6..15e65af61 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d65g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2326cd2ea29aae0ebe526f87619ccbbd8022d6ef41c5c7ef08e78a7f51dbed09",
-                    "mixHash" : "0x6a0336dd050bbf66758cb41e2f488fb95d2c55ad2794af23717b76e439704299",
-                    "nonce" : "0x817b475e40cc59ad",
+                    "hash" : "0x47f5a4670eee3db7b2fe6ede693b8af2db6e89eafa5ab5fbb2588964f3eedd83",
+                    "mixHash" : "0x12edf33b1f1828aeae8b8aa783343f0dc7b3272eaf46c064e846941eeb336a2e",
+                    "nonce" : "0x8f625a3c1e797cbb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06a0336dd050bbf66758cb41e2f488fb95d2c55ad2794af23717b76e43970429988817b475e40cc59adf85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a012edf33b1f1828aeae8b8aa783343f0dc7b3272eaf46c064e846941eeb336a2e888f625a3c1e797cbbf85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2326cd2ea29aae0ebe526f87619ccbbd8022d6ef41c5c7ef08e78a7f51dbed09",
+        "lastblockhash" : "0x47f5a4670eee3db7b2fe6ede693b8af2db6e89eafa5ab5fbb2588964f3eedd83",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d65g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5862b74d8d6c92604a2090d71ba8fe01dbfe81a24d4d121ae967e294b9117603",
-                    "mixHash" : "0x00b6cb9b6113749b71b990c90f7876006ab875fb321d899106f573981ab4bc44",
-                    "nonce" : "0x9cc036a823378b88",
+                    "hash" : "0xdbbfba2292e9d19d910af3a96bcde002117b14a735a1dfc48ec586625fb0a3e4",
+                    "mixHash" : "0x9648300f54293cf3e35798586d60f53bd61d95969cd15c0917fca8838b06db23",
+                    "nonce" : "0x461663b768b48600",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a000b6cb9b6113749b71b990c90f7876006ab875fb321d899106f573981ab4bc44889cc036a823378b88f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09648300f54293cf3e35798586d60f53bd61d95969cd15c0917fca8838b06db2388461663b768b48600f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5862b74d8d6c92604a2090d71ba8fe01dbfe81a24d4d121ae967e294b9117603",
+        "lastblockhash" : "0xdbbfba2292e9d19d910af3a96bcde002117b14a735a1dfc48ec586625fb0a3e4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d65g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9bacd02f8b002c8f9692cb95a6064320fd84185b5d734ab2347388618d9d1b2a",
-                    "mixHash" : "0xbb2c4745cfba66842a7c5fa2154025596e7542a5a81123779587e2868bfeec50",
-                    "nonce" : "0xf98c3176d5ed94c9",
+                    "hash" : "0x44c5201889a6234a92d4b3f92b52845cec3d40cba8f6cdd9cc97d79b6ee1c80b",
+                    "mixHash" : "0xcbecf038bd1eaf4a0f3d61a48fc630048d5653b453bc2f61660c50782d6e534c",
+                    "nonce" : "0x6ce17dafdb16e116",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb2c4745cfba66842a7c5fa2154025596e7542a5a81123779587e2868bfeec5088f98c3176d5ed94c9f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cbecf038bd1eaf4a0f3d61a48fc630048d5653b453bc2f61660c50782d6e534c886ce17dafdb16e116f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bacd02f8b002c8f9692cb95a6064320fd84185b5d734ab2347388618d9d1b2a",
+        "lastblockhash" : "0x44c5201889a6234a92d4b3f92b52845cec3d40cba8f6cdd9cc97d79b6ee1c80b",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d65g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7fe6686b20cecb8a44dc2b69de1ef5c0e7ef61ed89dcc0a68ba2c52079e992de",
-                    "mixHash" : "0x5b130d03ea68c7f7998f5a2ea5a5c51287028b5f89fd947a90f5c280fbf99c33",
-                    "nonce" : "0x3a35911b15398c6a",
+                    "hash" : "0xe5846d9f61874ddcde0ca977a6b40ab01f3d3028dc32e46b26046179796af962",
+                    "mixHash" : "0x1d7da6318cb91767292482ef6d74fe765f62882ff11c95bbf5e7d542519e7609",
+                    "nonce" : "0xd09e50f6fcf3d602",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b130d03ea68c7f7998f5a2ea5a5c51287028b5f89fd947a90f5c280fbf99c33883a35911b15398c6af85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d7da6318cb91767292482ef6d74fe765f62882ff11c95bbf5e7d542519e760988d09e50f6fcf3d602f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7fe6686b20cecb8a44dc2b69de1ef5c0e7ef61ed89dcc0a68ba2c52079e992de",
+        "lastblockhash" : "0xe5846d9f61874ddcde0ca977a6b40ab01f3d3028dc32e46b26046179796af962",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d65g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9c82b432436ebf8a4df01ec4f5321fdc60936df11829cce0fb73a60907d7f773",
-                    "mixHash" : "0xa65d50744928671a65f79549932e52262b969d9b0449677eefde2c8babbafe08",
-                    "nonce" : "0x769e9e07f1717ba5",
+                    "hash" : "0xf2f0f33951cdc8849d138c35c130422bfcc148a8ee658065a217c3f84e337bbe",
+                    "mixHash" : "0x334157eb8df964ef5be4427c3d71631b181827e3a5c2d67511b42b0f7858b62d",
+                    "nonce" : "0xca62486040821362",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a65d50744928671a65f79549932e52262b969d9b0449677eefde2c8babbafe0888769e9e07f1717ba5f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0334157eb8df964ef5be4427c3d71631b181827e3a5c2d67511b42b0f7858b62d88ca62486040821362f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c82b432436ebf8a4df01ec4f5321fdc60936df11829cce0fb73a60907d7f773",
+        "lastblockhash" : "0xf2f0f33951cdc8849d138c35c130422bfcc148a8ee658065a217c3f84e337bbe",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d65g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d65g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf27298955145ddc2afe466506dab9d4240eea901cb8d095038cefb07b3627a62",
-                    "mixHash" : "0xc0c7208d865c16729d52566b074de73996e8ad3b50bcfae9b37f018aa8660153",
-                    "nonce" : "0x0eee4dc3aa8b2ee4",
+                    "hash" : "0x0653366951fea03a808486d8fc070607aec804d1e3d7ffaf9b62e4bcb73d1f39",
+                    "mixHash" : "0xeb65d567f20073ab7672f2f155fbdd7bd71cd9940681f37c4d0037f3e7553546",
+                    "nonce" : "0x2d307abecc26c79d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xe87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c0c7208d865c16729d52566b074de73996e8ad3b50bcfae9b37f018aa8660153880eee4dc3aa8b2ee4f85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e87c3368a8b3f4404c448da42e49e1b0f113db8637e6a8be2d50b4ce563ffb03a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eb65d567f20073ab7672f2f155fbdd7bd71cd9940681f37c4d0037f3e7553546882d307abecc26c79df85ff85d800183061a8080830186a08e6001600160016001be60006000f31ba008ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14a043e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001be60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf27298955145ddc2afe466506dab9d4240eea901cb8d095038cefb07b3627a62",
+        "lastblockhash" : "0x0653366951fea03a808486d8fc070607aec804d1e3d7ffaf9b62e4bcb73d1f39",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0.json
index 7d4cbb6d8..1aa60a4d4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d66g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8d28063feb069e6eb48c5e5b6679f350b9bde2f3f041c33b5a46ecbd1f2c4756",
-                    "mixHash" : "0x4f9e69745e15f920925a316886e44030428368f90a8beea0c8a63314cc488c9e",
-                    "nonce" : "0xa0d28f9c4849c29d",
+                    "hash" : "0x41ff36d34321255156b0209d179bbfda14dd85081d47b8b1e6e9f68f1eb30df1",
+                    "mixHash" : "0x32e12666d2a48525d1e4fe599283a4cce0731be97f0312cb33dbb4fabf018057",
+                    "nonce" : "0x0631c826d106a9bb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04f9e69745e15f920925a316886e44030428368f90a8beea0c8a63314cc488c9e88a0d28f9c4849c29df85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032e12666d2a48525d1e4fe599283a4cce0731be97f0312cb33dbb4fabf018057880631c826d106a9bbf85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d28063feb069e6eb48c5e5b6679f350b9bde2f3f041c33b5a46ecbd1f2c4756",
+        "lastblockhash" : "0x41ff36d34321255156b0209d179bbfda14dd85081d47b8b1e6e9f68f1eb30df1",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d66g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9ca882e9886f0cf77365203ab5d2324f22a1176ce08456e9f7aebf17f949e238",
-                    "mixHash" : "0xaf70ac098d9363dcdc3e519c74124147af0b06f1d51ca8111a12ae67392d0ee0",
-                    "nonce" : "0x6a5fa8475fcd5735",
+                    "hash" : "0xd1fc65206d53604d4915b2363a0609dc406d1d72f17219830dea102b6ba45f36",
+                    "mixHash" : "0x323d5d39042b6034b3abd2b6250a642c1d0bdff7d3ad5443052ea56609af29a8",
+                    "nonce" : "0xe60894fb52df307b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0af70ac098d9363dcdc3e519c74124147af0b06f1d51ca8111a12ae67392d0ee0886a5fa8475fcd5735f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0323d5d39042b6034b3abd2b6250a642c1d0bdff7d3ad5443052ea56609af29a888e60894fb52df307bf85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ca882e9886f0cf77365203ab5d2324f22a1176ce08456e9f7aebf17f949e238",
+        "lastblockhash" : "0xd1fc65206d53604d4915b2363a0609dc406d1d72f17219830dea102b6ba45f36",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d66g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x830f73a0a082b639cd7f65716d1a33fc50587830e0a59a4174ad422882880ad8",
-                    "mixHash" : "0x17b858a694cbe63dcddebdf359e12f0e09b1ff12f5577f8fdfaaef6ca611a700",
-                    "nonce" : "0x6f5f23f2b2c313b8",
+                    "hash" : "0x5bbe29c4cf90b515981df7e98944ed9b43df9dc609efe258202a6600662518b2",
+                    "mixHash" : "0x99b32a88851e8f59b0cf6396c2cb46130ca7dd08208ff04a7a360e6c2345cd6a",
+                    "nonce" : "0x8f048c717c81515f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017b858a694cbe63dcddebdf359e12f0e09b1ff12f5577f8fdfaaef6ca611a700886f5f23f2b2c313b8f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a099b32a88851e8f59b0cf6396c2cb46130ca7dd08208ff04a7a360e6c2345cd6a888f048c717c81515ff85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x830f73a0a082b639cd7f65716d1a33fc50587830e0a59a4174ad422882880ad8",
+        "lastblockhash" : "0x5bbe29c4cf90b515981df7e98944ed9b43df9dc609efe258202a6600662518b2",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d66g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x268d3500af380bd83550bdb6c37da4ca42b132acc391224b30bce7824fb2cae6",
-                    "mixHash" : "0x95563f8f5a7f8c4b01c938bfa9f43a9ffb43d025216ec9e4adf7888e3116036c",
-                    "nonce" : "0x5a7782a2f4ebd865",
+                    "hash" : "0xcf4f36947406210b1c90553538ec359c5a3b6aed20d28c4c900615483461cfff",
+                    "mixHash" : "0xef205c610cb2e754b7df970fb7ac5fc763a85cd0ebbaa7f237f174f3fcd29293",
+                    "nonce" : "0x2c969a63760d3086",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a095563f8f5a7f8c4b01c938bfa9f43a9ffb43d025216ec9e4adf7888e3116036c885a7782a2f4ebd865f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef205c610cb2e754b7df970fb7ac5fc763a85cd0ebbaa7f237f174f3fcd29293882c969a63760d3086f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x268d3500af380bd83550bdb6c37da4ca42b132acc391224b30bce7824fb2cae6",
+        "lastblockhash" : "0xcf4f36947406210b1c90553538ec359c5a3b6aed20d28c4c900615483461cfff",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d66g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9cb5aac7e12e19dfe936a9bb6e22ab792fec45aa5d0934850d12f321d1eeb88c",
-                    "mixHash" : "0x2b9020cfe4eedeceb71379edc9a24350ddd181d039dda94ad14a48564cd5b90d",
-                    "nonce" : "0x2ae799b55fc1f2e9",
+                    "hash" : "0x444707b768da15b84d3e7885083ab6ef4f509be42c37d3f636edabdde0efc34e",
+                    "mixHash" : "0x552323e90359d10a798dbd05e08a21889b76f2a6f8c6652b7eac7cc75a98f57e",
+                    "nonce" : "0x5216e35ae5f18bc4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b9020cfe4eedeceb71379edc9a24350ddd181d039dda94ad14a48564cd5b90d882ae799b55fc1f2e9f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0552323e90359d10a798dbd05e08a21889b76f2a6f8c6652b7eac7cc75a98f57e885216e35ae5f18bc4f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cb5aac7e12e19dfe936a9bb6e22ab792fec45aa5d0934850d12f321d1eeb88c",
+        "lastblockhash" : "0x444707b768da15b84d3e7885083ab6ef4f509be42c37d3f636edabdde0efc34e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d66g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d66g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3200e24c4b182f68c89e3b185808f9ecf5b9559838b2c4602e78b673485cbd84",
-                    "mixHash" : "0x58ea7446e4c453811186227c36f1f30b9f092aa6fb559af4e976c9698bc04a88",
-                    "nonce" : "0x42e961e175102324",
+                    "hash" : "0x77fba974ade3cdf6ddefbb2320d6194f40e5532c525643d5280741bd0ed03999",
+                    "mixHash" : "0xae65e36129c4e64c8d9f8260c607ad24b4f1237970547aa7c04d10508956f1b7",
+                    "nonce" : "0xd0220b66fc7292cf",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a058ea7446e4c453811186227c36f1f30b9f092aa6fb559af4e976c9698bc04a888842e961e175102324f85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03b9643ed8731ca5175d96939b2c0d3b651a5ce4914c9cbf27c2f247015f8f348a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ae65e36129c4e64c8d9f8260c607ad24b4f1237970547aa7c04d10508956f1b788d0220b66fc7292cff85ff85d800183061a8080830186a08e6001600160016001bf60006000f31ca07e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58caa01a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001bf60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3200e24c4b182f68c89e3b185808f9ecf5b9559838b2c4602e78b673485cbd84",
+        "lastblockhash" : "0x77fba974ade3cdf6ddefbb2320d6194f40e5532c525643d5280741bd0ed03999",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0.json
index 1d394bb9c..94dbd646e 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d67g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x27441fe69a5114efdfb4a476c0d27269dad87aa83d2e44c21c1aac4b7b0b9a74",
-                    "mixHash" : "0x9fd2fd28552b4da69ca297eb9febb3b36262a91dac147eb5094ec9c7688fa01d",
-                    "nonce" : "0x7744af1766605771",
+                    "hash" : "0x8510c8d2c21b6fa5f84d7418a162bc44205830f67b3e986632907dd7920be21e",
+                    "mixHash" : "0xbc63af8fb6fb9f02378cd56f9fbdf69ee4d4c6627da6f9b8b8ba3de29cf48749",
+                    "nonce" : "0x540b59883620a88a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09fd2fd28552b4da69ca297eb9febb3b36262a91dac147eb5094ec9c7688fa01d887744af1766605771f85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bc63af8fb6fb9f02378cd56f9fbdf69ee4d4c6627da6f9b8b8ba3de29cf4874988540b59883620a88af85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27441fe69a5114efdfb4a476c0d27269dad87aa83d2e44c21c1aac4b7b0b9a74",
+        "lastblockhash" : "0x8510c8d2c21b6fa5f84d7418a162bc44205830f67b3e986632907dd7920be21e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d67g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe6974ebc42564d9e9a572406ec52ee4c8df80afbdb1b3ae5bc24eae24d8e134a",
-                    "mixHash" : "0xf45207af8090c5e0a3e3355ab38ee7f746e1fdd683233355d7edbeeb5b439532",
-                    "nonce" : "0x105c7992ee36fffe",
+                    "hash" : "0xe0e5be6026ca07481aea2b2c48d0fb028364f1debba0994a9d68fd0e956eb532",
+                    "mixHash" : "0x4e259b5a24c02465f469b85bb53d70ae6aa7a5cce3a6f934f26e09cf64e35a39",
+                    "nonce" : "0xb849d824dcfe8c91",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f45207af8090c5e0a3e3355ab38ee7f746e1fdd683233355d7edbeeb5b43953288105c7992ee36fffef85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04e259b5a24c02465f469b85bb53d70ae6aa7a5cce3a6f934f26e09cf64e35a3988b849d824dcfe8c91f85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6974ebc42564d9e9a572406ec52ee4c8df80afbdb1b3ae5bc24eae24d8e134a",
+        "lastblockhash" : "0xe0e5be6026ca07481aea2b2c48d0fb028364f1debba0994a9d68fd0e956eb532",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d67g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xee7c9f2e627ab723d3f7f3cbeb80010f24c85f7df11fb95e484ccb5a6fcb798d",
-                    "mixHash" : "0xabc1e9d87348ae04c53e5bc4de8c851262b5abb9a96d461b6474ba6e7fc5e174",
-                    "nonce" : "0x672345a703250b9a",
+                    "hash" : "0x1583718b12e7dddb99bc8ac630388514accdf10d0c7a88c447660a7e2f4eb761",
+                    "mixHash" : "0x1b5d9c40a13ba55b13ec834c0811bd1fb2a4e49f4d6d8871063d2298cafd29e9",
+                    "nonce" : "0x29019020fda2462b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0abc1e9d87348ae04c53e5bc4de8c851262b5abb9a96d461b6474ba6e7fc5e17488672345a703250b9af85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01b5d9c40a13ba55b13ec834c0811bd1fb2a4e49f4d6d8871063d2298cafd29e98829019020fda2462bf85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee7c9f2e627ab723d3f7f3cbeb80010f24c85f7df11fb95e484ccb5a6fcb798d",
+        "lastblockhash" : "0x1583718b12e7dddb99bc8ac630388514accdf10d0c7a88c447660a7e2f4eb761",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d67g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5d559ef3af0ecfe98068e8cd9bc9331fadf1d9959a02160de4037f3252dbe0bb",
-                    "mixHash" : "0x9bb8e53bd5fb3609c11f920bd5f8bd3da0225e967c4d1efb148b40a9d733f44b",
-                    "nonce" : "0x340dc23135a283fe",
+                    "hash" : "0x70ce4d2c5b9e91dca5f85bb5e2f6b82ec81b3549ad73e92bd01721ece048a37b",
+                    "mixHash" : "0x29ad65315daba1c5d30754480c0560792d5f3ca2fb6b09b7446f1b2a1414b9fc",
+                    "nonce" : "0x0a63b3ecd009a06d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09bb8e53bd5fb3609c11f920bd5f8bd3da0225e967c4d1efb148b40a9d733f44b88340dc23135a283fef85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a029ad65315daba1c5d30754480c0560792d5f3ca2fb6b09b7446f1b2a1414b9fc880a63b3ecd009a06df85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d559ef3af0ecfe98068e8cd9bc9331fadf1d9959a02160de4037f3252dbe0bb",
+        "lastblockhash" : "0x70ce4d2c5b9e91dca5f85bb5e2f6b82ec81b3549ad73e92bd01721ece048a37b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d67g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8314b55c3fe1464959029a9fc46e3af0c878368a95f48bda86b66b83dcfd9c0e",
-                    "mixHash" : "0x5a64439915d08290d26748fbe4e71769a33aca42711323be007fe7fc545e9fcd",
-                    "nonce" : "0x229be338a475a32c",
+                    "hash" : "0x9c34d1f7662781967f3aba2ffd6cc1ceb5d1129513c0ab81db2cf9c71ab4daaa",
+                    "mixHash" : "0x1144d76cc54b126283c88450f8b8106d1d7a22d45234388b0c1f83ec3f9dbee4",
+                    "nonce" : "0x0f3a535c9cebce51",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05a64439915d08290d26748fbe4e71769a33aca42711323be007fe7fc545e9fcd88229be338a475a32cf85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01144d76cc54b126283c88450f8b8106d1d7a22d45234388b0c1f83ec3f9dbee4880f3a535c9cebce51f85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8314b55c3fe1464959029a9fc46e3af0c878368a95f48bda86b66b83dcfd9c0e",
+        "lastblockhash" : "0x9c34d1f7662781967f3aba2ffd6cc1ceb5d1129513c0ab81db2cf9c71ab4daaa",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d67g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d67g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf5906c818f15259824260da42efbfc01ba341a23e91ca1e13983b50521e8e767",
-                    "mixHash" : "0x62af2aa850ee9000fdd02e062eeb0e6472c6a177e218828dd745e73abfcdacbb",
-                    "nonce" : "0x6bd524aa99b8ac33",
+                    "hash" : "0x7a1a1d16453ad18bf82a3fca28f1e8182c6c522c945d1bb2828a38f82e8e6e90",
+                    "mixHash" : "0xd2fbc91602bca332770bf83b50fc8ea32d94646d6c853dc24d69e1c07232e40a",
+                    "nonce" : "0xc052379179377b0c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a062af2aa850ee9000fdd02e062eeb0e6472c6a177e218828dd745e73abfcdacbb886bd524aa99b8ac33f85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bd02b2aad60841f0a69b4c7442a15fd424b40489cdd553e935c477f4dca2ed04a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d2fbc91602bca332770bf83b50fc8ea32d94646d6c853dc24d69e1c07232e40a88c052379179377b0cf85ff85d800183061a8080830186a08e6001600160016001c060006000f31ba050c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6a035fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6febc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c060006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5906c818f15259824260da42efbfc01ba341a23e91ca1e13983b50521e8e767",
+        "lastblockhash" : "0x7a1a1d16453ad18bf82a3fca28f1e8182c6c522c945d1bb2828a38f82e8e6e90",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0.json
index 4ec29bf56..5c2d731c4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d68g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa5fdc8d316fd397ab735af314c701ebdfe972b453eea438d6c80e961f27eddd3",
-                    "mixHash" : "0x07876d85442ffad6ffc78565f75060c2ad1815e848a8017a850482cc6b848b9a",
-                    "nonce" : "0x768f27c6ab1a2971",
+                    "hash" : "0xb1def5826cc9d77f7edb239a17424deedcd5611d3ff0d35572dd7e5535235541",
+                    "mixHash" : "0x4781026aa91ce20a411264b96560b48a7ab2f3550c67e83aed9314c1ef9953fb",
+                    "nonce" : "0x48df7ff74137e8b8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a007876d85442ffad6ffc78565f75060c2ad1815e848a8017a850482cc6b848b9a88768f27c6ab1a2971f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04781026aa91ce20a411264b96560b48a7ab2f3550c67e83aed9314c1ef9953fb8848df7ff74137e8b8f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5fdc8d316fd397ab735af314c701ebdfe972b453eea438d6c80e961f27eddd3",
+        "lastblockhash" : "0xb1def5826cc9d77f7edb239a17424deedcd5611d3ff0d35572dd7e5535235541",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d68g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6826256d39a99db676e0b1baab61f6879bb7ee5472b56d52b746012a6b844de0",
-                    "mixHash" : "0x22c395e77b4b3ebf6385e8c01999f84797aa717fe951b7d4c2e1b59b7874968c",
-                    "nonce" : "0xcbe72f085cfd5b84",
+                    "hash" : "0xa98888585d27ce4cd29c2f335b53ef4bdf776be60019fbda23aece05402c92cb",
+                    "mixHash" : "0xd55dfcca54199f7a85e4de4ab1ccade3d57e97c0c810a2dcea63b8a1c2b43904",
+                    "nonce" : "0xff4cc2c32e12fc76",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022c395e77b4b3ebf6385e8c01999f84797aa717fe951b7d4c2e1b59b7874968c88cbe72f085cfd5b84f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d55dfcca54199f7a85e4de4ab1ccade3d57e97c0c810a2dcea63b8a1c2b4390488ff4cc2c32e12fc76f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6826256d39a99db676e0b1baab61f6879bb7ee5472b56d52b746012a6b844de0",
+        "lastblockhash" : "0xa98888585d27ce4cd29c2f335b53ef4bdf776be60019fbda23aece05402c92cb",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d68g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf9ba1df4d28a8006260ae5fd3d961c29ad2670e82fc4e2534b0f2d351670d273",
-                    "mixHash" : "0x1a4f0552d5064f93fa116c4267f3db9ab6afb27c854f7553bb53f83d189bc62c",
-                    "nonce" : "0xc3178c96430b5d68",
+                    "hash" : "0xe7134c3c5a830d6192e58e745551a0782902fe21540c2d507132f4d119a086d3",
+                    "mixHash" : "0xe91f028c5bc01aebf57ea9d18074d2efe7e2aa75934ee057e500778d612f6ab3",
+                    "nonce" : "0xa21f7872a56efdf2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01a4f0552d5064f93fa116c4267f3db9ab6afb27c854f7553bb53f83d189bc62c88c3178c96430b5d68f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e91f028c5bc01aebf57ea9d18074d2efe7e2aa75934ee057e500778d612f6ab388a21f7872a56efdf2f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9ba1df4d28a8006260ae5fd3d961c29ad2670e82fc4e2534b0f2d351670d273",
+        "lastblockhash" : "0xe7134c3c5a830d6192e58e745551a0782902fe21540c2d507132f4d119a086d3",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d68g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x29bf7116c4cb99fc916bca48f6545dfd71be0f77e7c9be2dc3b0d89a30f44cb5",
-                    "mixHash" : "0x3e4f4659d2d27ab547a66a7799923275ea6b4765e708f1c52655e3f6b1ad6f91",
-                    "nonce" : "0x046008f874feaff4",
+                    "hash" : "0xf6d61affe912378917f2f9c9fd467dadfcded54a96d493cf73c93e4f55d848fb",
+                    "mixHash" : "0x0acb7c5cd58cc1bb8acd608784b2d22629f3aac29c20a2f12aceff9e35b40c48",
+                    "nonce" : "0x65230845591e9ac3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03e4f4659d2d27ab547a66a7799923275ea6b4765e708f1c52655e3f6b1ad6f9188046008f874feaff4f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00acb7c5cd58cc1bb8acd608784b2d22629f3aac29c20a2f12aceff9e35b40c488865230845591e9ac3f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29bf7116c4cb99fc916bca48f6545dfd71be0f77e7c9be2dc3b0d89a30f44cb5",
+        "lastblockhash" : "0xf6d61affe912378917f2f9c9fd467dadfcded54a96d493cf73c93e4f55d848fb",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d68g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe4968660c92529386ec8a7f2a18c37e1456b3c29c1af95c87e85add2cfb01607",
-                    "mixHash" : "0x2b561803bf514b3f25b18b83058f073e06d7d1677e1bb4d0a75b2696d01b9e7b",
-                    "nonce" : "0x9847d1f3e66a298c",
+                    "hash" : "0xee754894a609fff84c4e144ed324cc9ec9cc5e93e33307a5c80498cea25b1ca3",
+                    "mixHash" : "0x275ee424ca3f7fff344ec9f1662c0cec2449f63bafe9a05242e88219775a9301",
+                    "nonce" : "0x8f79bc57bac0e4c9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02b561803bf514b3f25b18b83058f073e06d7d1677e1bb4d0a75b2696d01b9e7b889847d1f3e66a298cf85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0275ee424ca3f7fff344ec9f1662c0cec2449f63bafe9a05242e88219775a9301888f79bc57bac0e4c9f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4968660c92529386ec8a7f2a18c37e1456b3c29c1af95c87e85add2cfb01607",
+        "lastblockhash" : "0xee754894a609fff84c4e144ed324cc9ec9cc5e93e33307a5c80498cea25b1ca3",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d68g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d68g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x366bd03660ca5f4f67a7bd91d568e9aa914cf4835eb4b632b992c55edef2fdbc",
-                    "mixHash" : "0x4dd17ef9ef2f4c3d444b9c4bb40bb84962727c97efb617a248b14df98383dd21",
-                    "nonce" : "0x7ae35d166e168bd0",
+                    "hash" : "0x83aa63a9fd8875a3c48c6b4254aa502d91277ee4216558e77211e9aa705aa126",
+                    "mixHash" : "0x350d8363e36d51a7de7ad3e4b7b726904d17bc90fab83fa751e6e5d337b603d6",
+                    "nonce" : "0x4cdf912bfca7194b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x4c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04dd17ef9ef2f4c3d444b9c4bb40bb84962727c97efb617a248b14df98383dd21887ae35d166e168bd0f85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea04c0bec957a0f7ec7b17363b37621a5b0fa8ab82f55ead0f73b81e693384b6870a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0350d8363e36d51a7de7ad3e4b7b726904d17bc90fab83fa751e6e5d337b603d6884cdf912bfca7194bf85ff85d800183061a8080830186a08e6001600160016001c160006000f31ca0ef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaaca01f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c160006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x366bd03660ca5f4f67a7bd91d568e9aa914cf4835eb4b632b992c55edef2fdbc",
+        "lastblockhash" : "0x83aa63a9fd8875a3c48c6b4254aa502d91277ee4216558e77211e9aa705aa126",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0.json
index 4a4485aa4..7098f53a5 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d69g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6c0539da91384dddda985e43499c506e9cab75990ff1078858eb2f78a97d4a9b",
-                    "mixHash" : "0x41676ffa0c37bc76cdf0ccbc5608167bf8b3013d780214e9137c9a3024635e93",
-                    "nonce" : "0x1677a53c3807b30a",
+                    "hash" : "0x439aaa3578f48a5f966117775f8879404ce01581edbfa4c58634ff9fb0c25f9f",
+                    "mixHash" : "0xa7042f99df5b410e94c0a919a65a50f5a4e5409baafe5b2d99e4a48d964d2422",
+                    "nonce" : "0xb5f689131845c7b0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a041676ffa0c37bc76cdf0ccbc5608167bf8b3013d780214e9137c9a3024635e93881677a53c3807b30af85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a7042f99df5b410e94c0a919a65a50f5a4e5409baafe5b2d99e4a48d964d242288b5f689131845c7b0f85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c0539da91384dddda985e43499c506e9cab75990ff1078858eb2f78a97d4a9b",
+        "lastblockhash" : "0x439aaa3578f48a5f966117775f8879404ce01581edbfa4c58634ff9fb0c25f9f",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d69g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5e33788cd1deedc753b65cce01f0b22bcc649ebafeef4e06b81a7d00c457d7ef",
-                    "mixHash" : "0xba860b6f8b177633fc580acacea9e45a13978935418702b8c46673c81414c084",
-                    "nonce" : "0x8542e00fb2d5b5c5",
+                    "hash" : "0x45eea85af62de7f05c31b4cb15bf4520f085e1a16205cd600e60ad2b4548f9e1",
+                    "mixHash" : "0x17058ea8a53fca477a46cf21214e1c2ab812b2062696bfa78ca79357baeb8a0c",
+                    "nonce" : "0xe5b5f0368cec0463",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ba860b6f8b177633fc580acacea9e45a13978935418702b8c46673c81414c084888542e00fb2d5b5c5f85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a017058ea8a53fca477a46cf21214e1c2ab812b2062696bfa78ca79357baeb8a0c88e5b5f0368cec0463f85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e33788cd1deedc753b65cce01f0b22bcc649ebafeef4e06b81a7d00c457d7ef",
+        "lastblockhash" : "0x45eea85af62de7f05c31b4cb15bf4520f085e1a16205cd600e60ad2b4548f9e1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d69g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x09361aa60dd22062a14c697fd750b09e734f4aa660889c5bab8d64672c8636c9",
-                    "mixHash" : "0xe94b12a468add19be2daa85392521377f414a6cc4855a20e4fd794c8813047df",
-                    "nonce" : "0x948e29e6d8acdede",
+                    "hash" : "0x7594c7b193511920c6534eeaefa50c8a67472e457cf0223685748f5e80e57b0e",
+                    "mixHash" : "0xac14a3c8bea08fb5a975787c6713fddb75b0e6c122a46ca4d03fe580fedc1ed1",
+                    "nonce" : "0x6b9b18b037545613",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e94b12a468add19be2daa85392521377f414a6cc4855a20e4fd794c8813047df88948e29e6d8acdedef85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ac14a3c8bea08fb5a975787c6713fddb75b0e6c122a46ca4d03fe580fedc1ed1886b9b18b037545613f85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09361aa60dd22062a14c697fd750b09e734f4aa660889c5bab8d64672c8636c9",
+        "lastblockhash" : "0x7594c7b193511920c6534eeaefa50c8a67472e457cf0223685748f5e80e57b0e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d69g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3671a18ee4fc7fd92ba7c540c3820b59ea684975d926c872bf19a6e10d11140a",
-                    "mixHash" : "0x5313da500fd6bea7acbbb19e677778e73833ea3d8cf7229c29ffad748b076008",
-                    "nonce" : "0xf792c791ce98a89c",
+                    "hash" : "0x0617c8acc19e46b0cd3901dfdd68b9d6b432e23d770104d990d1e6a7bf94fdf6",
+                    "mixHash" : "0x73a0624e0a00c9a491fb468a9d289297d531f491b9e50e2d36fa4c52aa5cd1b0",
+                    "nonce" : "0x4b7fa40bbaeffa4f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05313da500fd6bea7acbbb19e677778e73833ea3d8cf7229c29ffad748b07600888f792c791ce98a89cf85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a073a0624e0a00c9a491fb468a9d289297d531f491b9e50e2d36fa4c52aa5cd1b0884b7fa40bbaeffa4ff85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3671a18ee4fc7fd92ba7c540c3820b59ea684975d926c872bf19a6e10d11140a",
+        "lastblockhash" : "0x0617c8acc19e46b0cd3901dfdd68b9d6b432e23d770104d990d1e6a7bf94fdf6",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d69g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4e7d3a779ed9f039016c761b25260f5e967f7f8c4631597fadca183a5d1f9cb1",
-                    "mixHash" : "0xe5ddb6df6ca043dc0020623f08d79fb3d8faf2ee331ff77587e9b628b5972642",
-                    "nonce" : "0x15e1483db22c09bb",
+                    "hash" : "0xd910e48363b03cbe482a881683f66da64b44ce0e53782597f51776f2f2dc5948",
+                    "mixHash" : "0x0d32b2489c17dc51009661830cc7ff3c1b1e802fb2b38ecd33d3c09b327194bc",
+                    "nonce" : "0x256b5e9f8263246d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e5ddb6df6ca043dc0020623f08d79fb3d8faf2ee331ff77587e9b628b59726428815e1483db22c09bbf85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d32b2489c17dc51009661830cc7ff3c1b1e802fb2b38ecd33d3c09b327194bc88256b5e9f8263246df85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e7d3a779ed9f039016c761b25260f5e967f7f8c4631597fadca183a5d1f9cb1",
+        "lastblockhash" : "0xd910e48363b03cbe482a881683f66da64b44ce0e53782597f51776f2f2dc5948",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d69g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d69g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe3eca47b6d81a7a6a30851c9219fbfe550f08c65be9e21e4d7742a17821d651b",
-                    "mixHash" : "0xd4917669f31eead805d8cd288a23eec6504aa096d82725578c1713af3209a507",
-                    "nonce" : "0xffa2e208804ce4aa",
+                    "hash" : "0xb995ca5186aee428ffb5e2c5ddb28fd2eb9207ec3fc75cd0fbc36362bb354095",
+                    "mixHash" : "0x32e28527deb2f7d7d9ce6fd72b5733bd7e04f21930e5ecc416d6810e5b0e7976",
+                    "nonce" : "0x57ae4c847093360e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d4917669f31eead805d8cd288a23eec6504aa096d82725578c1713af3209a50788ffa2e208804ce4aaf85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b09301ee2e0dadb812233c716f653dc829eea005f179c787bfab03c8c133ac4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032e28527deb2f7d7d9ce6fd72b5733bd7e04f21930e5ecc416d6810e5b0e79768857ae4c847093360ef85ff85d800183061a8080830186a08e6001600160016001c260006000f31ca0690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336aa055843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c260006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3eca47b6d81a7a6a30851c9219fbfe550f08c65be9e21e4d7742a17821d651b",
+        "lastblockhash" : "0xb995ca5186aee428ffb5e2c5ddb28fd2eb9207ec3fc75cd0fbc36362bb354095",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0.json
index 45a6240f7..5afd22c5b 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d6g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5dd6270e28811ad5c0aa0e0851a4ff45015a60017cdd98244d5af32d2c4fef05",
-                    "mixHash" : "0xb963b4acc3a30bab107e616c3e51deb4d06ac97f66e209a33b70f4eed5152c78",
-                    "nonce" : "0x72c83e0a89f61f12",
+                    "hash" : "0x8683ed42be19970d1902a8b155c2a6f1dd922399153f1b5f4c5f0dc1a87620fc",
+                    "mixHash" : "0xa4957ba7d02ae7112d609eef340be0523700cea9a52c45755defec1ba7e34906",
+                    "nonce" : "0x31ff61bf804c126f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b963b4acc3a30bab107e616c3e51deb4d06ac97f66e209a33b70f4eed5152c788872c83e0a89f61f12f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4957ba7d02ae7112d609eef340be0523700cea9a52c45755defec1ba7e349068831ff61bf804c126ff85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5dd6270e28811ad5c0aa0e0851a4ff45015a60017cdd98244d5af32d2c4fef05",
+        "lastblockhash" : "0x8683ed42be19970d1902a8b155c2a6f1dd922399153f1b5f4c5f0dc1a87620fc",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d6g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4ae640a27ad16093af99dd832b075f80e0206d3cdecfe5b55052dda3a934bc1a",
-                    "mixHash" : "0xea3ea5f70759ef8e75944201ea2aa2a9b605de9a6f2f958d13062d4cec5af656",
-                    "nonce" : "0x45e7b26b4a1c6523",
+                    "hash" : "0xbb93048638838ba4ff7f035c59d776ad1fb373f1d1a33f8b4e6a51c4725c56ea",
+                    "mixHash" : "0xf58df637375a06689059f4e5d4f2471bdc638b39ee936632eb80edf9c590d818",
+                    "nonce" : "0x4cdecd463cd3329d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ea3ea5f70759ef8e75944201ea2aa2a9b605de9a6f2f958d13062d4cec5af6568845e7b26b4a1c6523f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f58df637375a06689059f4e5d4f2471bdc638b39ee936632eb80edf9c590d818884cdecd463cd3329df85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ae640a27ad16093af99dd832b075f80e0206d3cdecfe5b55052dda3a934bc1a",
+        "lastblockhash" : "0xbb93048638838ba4ff7f035c59d776ad1fb373f1d1a33f8b4e6a51c4725c56ea",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d6g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd1cc7ac5b23e9eebb93c1e88dbf932286f8b5ad40a17f313dec0a697abe634cc",
-                    "mixHash" : "0xc889ac758ef2cf6b25d0d0a85c731397329982049148cde2711e99566c01b840",
-                    "nonce" : "0xc1d395da8e3f4cbe",
+                    "hash" : "0xcef63fd24492e4402786c5837aafc686b0fa984f6dc573c69d62c1cf82ecffc3",
+                    "mixHash" : "0x09b7061300a81c2b9e5a1cd7e2809273d9500d4b011340b6aa9217c2643a7f0a",
+                    "nonce" : "0x89e69eb86981b3ea",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c889ac758ef2cf6b25d0d0a85c731397329982049148cde2711e99566c01b84088c1d395da8e3f4cbef85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a009b7061300a81c2b9e5a1cd7e2809273d9500d4b011340b6aa9217c2643a7f0a8889e69eb86981b3eaf85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1cc7ac5b23e9eebb93c1e88dbf932286f8b5ad40a17f313dec0a697abe634cc",
+        "lastblockhash" : "0xcef63fd24492e4402786c5837aafc686b0fa984f6dc573c69d62c1cf82ecffc3",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d6g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd913216a741480b9bb19ced6060c2bbcb86285d4efbaafe77d4b310f49b103c1",
-                    "mixHash" : "0x747f512d20284285f675a8793d627ec9408c0445870c8fbed07591dda270977d",
-                    "nonce" : "0x656763a14252cc69",
+                    "hash" : "0xc9d1e1567d3c68a44c0c824f8c3df1f443ed6fed44345e0ddfd171ecb36d28a5",
+                    "mixHash" : "0xe016840527c259cffe59b697972ed51129a8263b08add1095a0c73ec81d95496",
+                    "nonce" : "0x58e9caafd16dd316",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0747f512d20284285f675a8793d627ec9408c0445870c8fbed07591dda270977d88656763a14252cc69f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e016840527c259cffe59b697972ed51129a8263b08add1095a0c73ec81d954968858e9caafd16dd316f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd913216a741480b9bb19ced6060c2bbcb86285d4efbaafe77d4b310f49b103c1",
+        "lastblockhash" : "0xc9d1e1567d3c68a44c0c824f8c3df1f443ed6fed44345e0ddfd171ecb36d28a5",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d6g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xeecb9cb3dc288a0f263aa0857791f3e2ff40a6cd4e47f0ca42d22b498be97978",
-                    "mixHash" : "0xb59ce697f62c3d8f6681309c60a7f4d672daf7622a979e29443cca53fa6de215",
-                    "nonce" : "0xbaf7007d172dfe4e",
+                    "hash" : "0x5d3d194a14b64471cea9d987728f4bd4d4545e554a6d46efbf7a69f223fdfbc6",
+                    "mixHash" : "0x9e5675481dc4bc007318001963ab138ef193a0c0847ef7b6601fabd02ceba70b",
+                    "nonce" : "0x9f3524a902de2c60",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b59ce697f62c3d8f6681309c60a7f4d672daf7622a979e29443cca53fa6de21588baf7007d172dfe4ef85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09e5675481dc4bc007318001963ab138ef193a0c0847ef7b6601fabd02ceba70b889f3524a902de2c60f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeecb9cb3dc288a0f263aa0857791f3e2ff40a6cd4e47f0ca42d22b498be97978",
+        "lastblockhash" : "0x5d3d194a14b64471cea9d987728f4bd4d4545e554a6d46efbf7a69f223fdfbc6",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d6g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d6g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf4a40b6ad10560e92e0fc4377433f623235966c73d7f0233eeeb43e1b3e7cdd6",
-                    "mixHash" : "0xa4cc61068f89be320b13cdc26674c116d568e42c2658455edf9720e90434ff43",
-                    "nonce" : "0x80b34217b0267b19",
+                    "hash" : "0xdb6a7883e9fc4ff64769be9099d5746fe62af237a99d4c20088e529cbc5d248f",
+                    "mixHash" : "0x572ea7325952cd756f3d12e1ba67c5e5037fbf9336f71347d0e5f4ca07d39375",
+                    "nonce" : "0xd3256764f5d92e11",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x3828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4cc61068f89be320b13cdc26674c116d568e42c2658455edf9720e90434ff438880b34217b0267b19f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea03828e7f6fbc00baa75afc7654fe25eccf8ce046f1b06c9961ebd575abd784b92a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0572ea7325952cd756f3d12e1ba67c5e5037fbf9336f71347d0e5f4ca07d3937588d3256764f5d92e11f85ff85d800183061a8080830186a08e60016001600160011c60006000f31ba0a737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9a0679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413dc0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011c60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4a40b6ad10560e92e0fc4377433f623235966c73d7f0233eeeb43e1b3e7cdd6",
+        "lastblockhash" : "0xdb6a7883e9fc4ff64769be9099d5746fe62af237a99d4c20088e529cbc5d248f",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0.json
index 514487e4a..5e9ceb6e7 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d70g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x090d46bee52323b6169744602e503ba9cd30baf23b11ee42e65a56e93f500c0b",
-                    "mixHash" : "0xc37644cbe16e06c1e033200cda0ac29e5a823df7ad12347f794e1aaca29efad0",
-                    "nonce" : "0xabd053ab2f90e984",
+                    "hash" : "0x74612117c1acfcfd9d408aba0595dd3301448a7a0adb27e568d782e9d6b18b5d",
+                    "mixHash" : "0xcf10f759cc6d3c8304cb5046a35a80fa210869b0b4877db9b6e7765ede501c8b",
+                    "nonce" : "0xaae11fdca876d973",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c37644cbe16e06c1e033200cda0ac29e5a823df7ad12347f794e1aaca29efad088abd053ab2f90e984f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cf10f759cc6d3c8304cb5046a35a80fa210869b0b4877db9b6e7765ede501c8b88aae11fdca876d973f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x090d46bee52323b6169744602e503ba9cd30baf23b11ee42e65a56e93f500c0b",
+        "lastblockhash" : "0x74612117c1acfcfd9d408aba0595dd3301448a7a0adb27e568d782e9d6b18b5d",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d70g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5324271bbe60e803f0f99902fabb7d1a6fe5d88fad4b9043f7e53b836ddab9b2",
-                    "mixHash" : "0x011595f24e4cb734e2109463f648e2669e21766b08f6dfd62b63c853835c95b6",
-                    "nonce" : "0xecef3dcfd594b3f8",
+                    "hash" : "0x75104e51de43e595dcbc11e9923be5a41ade931173bf50b2f4f9bc6f09780a4c",
+                    "mixHash" : "0x0a8eb112040d875530d0c200c5218f55f48d6f0ef7cd624b9434e769d3f36dde",
+                    "nonce" : "0x1b0f6cdfd6151075",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0011595f24e4cb734e2109463f648e2669e21766b08f6dfd62b63c853835c95b688ecef3dcfd594b3f8f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00a8eb112040d875530d0c200c5218f55f48d6f0ef7cd624b9434e769d3f36dde881b0f6cdfd6151075f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5324271bbe60e803f0f99902fabb7d1a6fe5d88fad4b9043f7e53b836ddab9b2",
+        "lastblockhash" : "0x75104e51de43e595dcbc11e9923be5a41ade931173bf50b2f4f9bc6f09780a4c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d70g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd035578a39c5d19006bfb9e631c2cb30ed939045211d6e03b7132a7ed1969bb9",
-                    "mixHash" : "0xc0fbf95e174850de1707ccce2e95905b8bb1c5b9d5279f8007527ad49056c194",
-                    "nonce" : "0x019018f52031e15b",
+                    "hash" : "0x9568539dbeb0b78b87bec8e971a7d4663a4f48ffac525bb9c801a64fe17db520",
+                    "mixHash" : "0x453c5b08d2b89739de74ae0172508183ccdec2dd91ff7657c38263e054f2c9f7",
+                    "nonce" : "0x477bc06af86ef67d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c0fbf95e174850de1707ccce2e95905b8bb1c5b9d5279f8007527ad49056c19488019018f52031e15bf85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0453c5b08d2b89739de74ae0172508183ccdec2dd91ff7657c38263e054f2c9f788477bc06af86ef67df85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd035578a39c5d19006bfb9e631c2cb30ed939045211d6e03b7132a7ed1969bb9",
+        "lastblockhash" : "0x9568539dbeb0b78b87bec8e971a7d4663a4f48ffac525bb9c801a64fe17db520",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d70g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x839a4b48c6c324990562270baa390f6c4a95df7cf65a6b70273989e6c3a60050",
-                    "mixHash" : "0x2c0b5dc1abf41fe4477c9bf43496e539ab9f16064dead2d5bf246b920fa27238",
-                    "nonce" : "0x129fee1e9f6bcaba",
+                    "hash" : "0x0efc3e8a5838f399363301c5aa9a97662f075055ab26a2925735e68a21d03467",
+                    "mixHash" : "0xdecafd0243d2de653b866a97cc11d83689e142abac626cb42c9a4a366dbf0a91",
+                    "nonce" : "0x32701416fe292a4e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c0b5dc1abf41fe4477c9bf43496e539ab9f16064dead2d5bf246b920fa2723888129fee1e9f6bcabaf85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0decafd0243d2de653b866a97cc11d83689e142abac626cb42c9a4a366dbf0a918832701416fe292a4ef85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x839a4b48c6c324990562270baa390f6c4a95df7cf65a6b70273989e6c3a60050",
+        "lastblockhash" : "0x0efc3e8a5838f399363301c5aa9a97662f075055ab26a2925735e68a21d03467",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d70g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe9603e9fb3f5001deba9200fb176ae619eee099cace2581d46e3d207ab18c006",
-                    "mixHash" : "0x318f90dcd799ba24e5c465c15624a205de3496547087f618cb85c05121ea91fb",
-                    "nonce" : "0x6e70f7aefe8f0172",
+                    "hash" : "0x782ac348188cee2cdd27c6da793147fc6d8f306d1ae664b6ac29a2c2f93a26d7",
+                    "mixHash" : "0xb79337cd028d94f6f5522744bde4eed6e69d7c183f19f303c37b13ea416f5c42",
+                    "nonce" : "0x1d0081c6214a8f88",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0318f90dcd799ba24e5c465c15624a205de3496547087f618cb85c05121ea91fb886e70f7aefe8f0172f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b79337cd028d94f6f5522744bde4eed6e69d7c183f19f303c37b13ea416f5c42881d0081c6214a8f88f85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9603e9fb3f5001deba9200fb176ae619eee099cace2581d46e3d207ab18c006",
+        "lastblockhash" : "0x782ac348188cee2cdd27c6da793147fc6d8f306d1ae664b6ac29a2c2f93a26d7",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d70g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d70g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcfd2754d967f77193b333876322db914dfc8850f90be04889edbfcd823fb9ceb",
-                    "mixHash" : "0xbe8d1e5eb07ef91c71068a95fe2491523061ba482736ade87a8fcbbf1c1128a5",
-                    "nonce" : "0x5fcb8e60071d3fad",
+                    "hash" : "0xc11deef22a078ecd1a58fb5deffbf10079673341438fd02eb571f485e11bd565",
+                    "mixHash" : "0x192c029e06994c30275414816f1130c69c12a1a8677d5a8ca65e6dc8b68fa794",
+                    "nonce" : "0x4eab91aa9233e4fc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xcd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0be8d1e5eb07ef91c71068a95fe2491523061ba482736ade87a8fcbbf1c1128a5885fcb8e60071d3fadf85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0cd0f0df754efc6afb6649be1e447946ffa6b10f275aafc2754477c2348e0bd74a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0192c029e06994c30275414816f1130c69c12a1a8677d5a8ca65e6dc8b68fa794884eab91aa9233e4fcf85ff85d800183061a8080830186a08e6001600160016001c360006000f31ca03ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19ca002f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c360006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfd2754d967f77193b333876322db914dfc8850f90be04889edbfcd823fb9ceb",
+        "lastblockhash" : "0xc11deef22a078ecd1a58fb5deffbf10079673341438fd02eb571f485e11bd565",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0.json
index 5b5c4be57..f9e273f67 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d71g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x56a4faa8a39207443f9d3fb5ad2ab3af788f32dd0b90a968de06061547e758ae",
-                    "mixHash" : "0xd3763050c0ae6bb86540d369aa02db88d30f0a3f89620264b36dcdc99484e25e",
-                    "nonce" : "0xd427eaaa31863848",
+                    "hash" : "0xf099aa0985d75a4d5931f772de54f966f95451877753517c5b7c55ebabd524f9",
+                    "mixHash" : "0xd4cea6e4ed8bf0b199679415ae5aa58eb3c3704f821a4dbdb57c6cc856633eb5",
+                    "nonce" : "0x6e85236d97aec0f9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3763050c0ae6bb86540d369aa02db88d30f0a3f89620264b36dcdc99484e25e88d427eaaa31863848f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d4cea6e4ed8bf0b199679415ae5aa58eb3c3704f821a4dbdb57c6cc856633eb5886e85236d97aec0f9f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56a4faa8a39207443f9d3fb5ad2ab3af788f32dd0b90a968de06061547e758ae",
+        "lastblockhash" : "0xf099aa0985d75a4d5931f772de54f966f95451877753517c5b7c55ebabd524f9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d71g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7b9da95a661788f4b613b3dabda6046579b9d1c890644fec8f2d13d6487a6627",
-                    "mixHash" : "0xfcefe687b30f0733234ab9c5de2234456b003c5f882181b3723f6b8faddec307",
-                    "nonce" : "0x9b3808eda0a7c38d",
+                    "hash" : "0x31c9f6b8c84548c68109005df58718bc78afc3d7fcdce2fdcbdc51f7f43e1bf8",
+                    "mixHash" : "0xa15b19c7530f177161a8be524d0b95149b84191abbb107074ff574170c784bf3",
+                    "nonce" : "0xbd44c538f36557b2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fcefe687b30f0733234ab9c5de2234456b003c5f882181b3723f6b8faddec307889b3808eda0a7c38df85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a15b19c7530f177161a8be524d0b95149b84191abbb107074ff574170c784bf388bd44c538f36557b2f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b9da95a661788f4b613b3dabda6046579b9d1c890644fec8f2d13d6487a6627",
+        "lastblockhash" : "0x31c9f6b8c84548c68109005df58718bc78afc3d7fcdce2fdcbdc51f7f43e1bf8",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d71g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x953efa6ed46424009287727f5842849a320bbf26b38e91aa10ff253e16478c92",
-                    "mixHash" : "0x52c90f03d8c6722e5db29f1a0f640ffe31526d1ad8bb9d8027f0a31ea8397903",
-                    "nonce" : "0xc98679d9f32f7a58",
+                    "hash" : "0x08152e31b59cfb432990415d41fa926deab925ae90c0d21fefb424aba2c4914d",
+                    "mixHash" : "0xf24d68191e41c04faf2f15419413efe4df729c7bfad4084bb474e237fbf1fc82",
+                    "nonce" : "0xf02f9be11f65caa9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052c90f03d8c6722e5db29f1a0f640ffe31526d1ad8bb9d8027f0a31ea839790388c98679d9f32f7a58f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f24d68191e41c04faf2f15419413efe4df729c7bfad4084bb474e237fbf1fc8288f02f9be11f65caa9f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x953efa6ed46424009287727f5842849a320bbf26b38e91aa10ff253e16478c92",
+        "lastblockhash" : "0x08152e31b59cfb432990415d41fa926deab925ae90c0d21fefb424aba2c4914d",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d71g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x20814f3d416efd8a5d0d158f959b29db2607af68b59a1dcf069683bdb0e53e28",
-                    "mixHash" : "0x0013b48d6d24e19c2c87a1cc7b67dd8d1c26321ea07fd079480ceb121e141fa4",
-                    "nonce" : "0x0fbc14246b03317f",
+                    "hash" : "0xae29514bea86981661c94d40060ade87a01a55cac12de7f1e2cd3fcb09830beb",
+                    "mixHash" : "0x8a0c5cf1bd5c95b0d0896f7848dbf6b546e9c25627ee81328e8f9c6c5ad95fd1",
+                    "nonce" : "0xd2a36fdec57daff8",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00013b48d6d24e19c2c87a1cc7b67dd8d1c26321ea07fd079480ceb121e141fa4880fbc14246b03317ff85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08a0c5cf1bd5c95b0d0896f7848dbf6b546e9c25627ee81328e8f9c6c5ad95fd188d2a36fdec57daff8f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20814f3d416efd8a5d0d158f959b29db2607af68b59a1dcf069683bdb0e53e28",
+        "lastblockhash" : "0xae29514bea86981661c94d40060ade87a01a55cac12de7f1e2cd3fcb09830beb",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d71g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1da62aa86f68a6db1a06ef383853e02d749bbe4ddd7922aeb21e344fe540999f",
-                    "mixHash" : "0x63135d2dce6a1f21076d2410e96a643341001325933065bea26673d43d41595c",
-                    "nonce" : "0x7ace8353f0d2789d",
+                    "hash" : "0xf11375cb4feac2d8d5d8185b080f9d88666f198070b2d958940888709a693365",
+                    "mixHash" : "0x8b2b955fa714662e61d10608cb81401776744f1edd66f8d1addc1ee89480b4e5",
+                    "nonce" : "0xd257df9e8f489be3",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a063135d2dce6a1f21076d2410e96a643341001325933065bea26673d43d41595c887ace8353f0d2789df85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08b2b955fa714662e61d10608cb81401776744f1edd66f8d1addc1ee89480b4e588d257df9e8f489be3f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1da62aa86f68a6db1a06ef383853e02d749bbe4ddd7922aeb21e344fe540999f",
+        "lastblockhash" : "0xf11375cb4feac2d8d5d8185b080f9d88666f198070b2d958940888709a693365",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d71g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d71g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdedcd023091ec0c5fcae8d666a6976655e652b487bcc91215444c4556a9a5346",
-                    "mixHash" : "0x5864b4ddb9aa4fba6f1b814acbde3d99d1180bf31c49e8a6ae719071655acea2",
-                    "nonce" : "0xcc644672c62dcb56",
+                    "hash" : "0xca5e0734e4faa42e8c9d0cbf233b8dff2a455a6b4e58c750e9bc62cde69015e2",
+                    "mixHash" : "0x177be3bdd6b9b6cf4d11d0bc9a8cf0f5d1a2dc8db879862953ac7bb23095c3f4",
+                    "nonce" : "0xd192faef9b2fc303",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x0b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05864b4ddb9aa4fba6f1b814acbde3d99d1180bf31c49e8a6ae719071655acea288cc644672c62dcb56f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea00b8132459a5c449b2c791fd7a80378f4055df7f4ccf2c1d1db53378dab266f47a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0177be3bdd6b9b6cf4d11d0bc9a8cf0f5d1a2dc8db879862953ac7bb23095c3f488d192faef9b2fc303f85ff85d800183061a8080830186a08e6001600160016001c460006000f31ca064a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9ca038fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c460006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdedcd023091ec0c5fcae8d666a6976655e652b487bcc91215444c4556a9a5346",
+        "lastblockhash" : "0xca5e0734e4faa42e8c9d0cbf233b8dff2a455a6b4e58c750e9bc62cde69015e2",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0.json
index fd8752b94..f052dabc4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d72g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xad0798420cf87d21ea1bb6f6cfd956249f202f7dca0cec08653625bda6d640f2",
-                    "mixHash" : "0xb3918392411c2097aec94a4157d1228394b968be0c9fcb595cf076bcabe314ac",
-                    "nonce" : "0x216d086e63f2d61d",
+                    "hash" : "0x09b20e48b2e87346383fa57b19ad0d5a58309fec8a624dfaebdad6f4e3f62638",
+                    "mixHash" : "0xdf2aa9c2c54ea0c2eca4f4d9930053284bb37c95a680ba9edde5b6c142cfe3b7",
+                    "nonce" : "0x20bef3e87a0ded79",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b3918392411c2097aec94a4157d1228394b968be0c9fcb595cf076bcabe314ac88216d086e63f2d61df85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0df2aa9c2c54ea0c2eca4f4d9930053284bb37c95a680ba9edde5b6c142cfe3b78820bef3e87a0ded79f85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad0798420cf87d21ea1bb6f6cfd956249f202f7dca0cec08653625bda6d640f2",
+        "lastblockhash" : "0x09b20e48b2e87346383fa57b19ad0d5a58309fec8a624dfaebdad6f4e3f62638",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d72g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4f8592bf52074eb9af88a3a4c399792455969b310cad9afc0ba21a0ed1fccc7c",
-                    "mixHash" : "0xd58872abe9abc438b5a5348e68efb582a07bbee443e1f050a9d98deb0a0149f7",
-                    "nonce" : "0x141ae5ee6705f79f",
+                    "hash" : "0x0352d2dff198bdb962b982fc48a4dc0476d3e3367c7636a76cc4c407d075cbac",
+                    "mixHash" : "0xe6c70ee7aae145df736d0c5f8b73044fcffe7ea702a05ae9ef5f36fde2a0ad07",
+                    "nonce" : "0x30b9a89ea4d05299",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d58872abe9abc438b5a5348e68efb582a07bbee443e1f050a9d98deb0a0149f788141ae5ee6705f79ff85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e6c70ee7aae145df736d0c5f8b73044fcffe7ea702a05ae9ef5f36fde2a0ad078830b9a89ea4d05299f85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f8592bf52074eb9af88a3a4c399792455969b310cad9afc0ba21a0ed1fccc7c",
+        "lastblockhash" : "0x0352d2dff198bdb962b982fc48a4dc0476d3e3367c7636a76cc4c407d075cbac",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d72g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdaded0e971e7d21024581a5c926952e99dc22384d42f0188b3b795f6e7f15316",
-                    "mixHash" : "0x54dcc27be512ffcc3f2dc94f3d330a7a57a112661a00066d28f2fa554207e392",
-                    "nonce" : "0x633740af0e84b047",
+                    "hash" : "0x4a6b88528196aa09572a7e7e3ab73ae74cd108bc5752426a39b5525ebb18e8f4",
+                    "mixHash" : "0x07b5f808c5386cd7b06934c6b2aca022310c8fb45b740a37bfc5d79033e33e84",
+                    "nonce" : "0x30a74a6a978b96ec",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a054dcc27be512ffcc3f2dc94f3d330a7a57a112661a00066d28f2fa554207e39288633740af0e84b047f85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a007b5f808c5386cd7b06934c6b2aca022310c8fb45b740a37bfc5d79033e33e848830a74a6a978b96ecf85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdaded0e971e7d21024581a5c926952e99dc22384d42f0188b3b795f6e7f15316",
+        "lastblockhash" : "0x4a6b88528196aa09572a7e7e3ab73ae74cd108bc5752426a39b5525ebb18e8f4",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d72g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xee49837989db309ffc652c1d2e32f4492b964626b177ae52c6bbdb9b57ca860a",
-                    "mixHash" : "0xc03069515b2ce41e2df11d0b925580e88ca556f3f802f8d87cb11dcc24625485",
-                    "nonce" : "0x996013b1f098c014",
+                    "hash" : "0xbbcca6ee3b8625309e9e3caebbb00bd937b6064b048d9ff692605e3e4a50499b",
+                    "mixHash" : "0x0530fd85ebf720be40bc36797816266f469c5c409ac7fdc2ccc53126a1dde6e8",
+                    "nonce" : "0xaae1bf25688d1e09",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c03069515b2ce41e2df11d0b925580e88ca556f3f802f8d87cb11dcc2462548588996013b1f098c014f85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00530fd85ebf720be40bc36797816266f469c5c409ac7fdc2ccc53126a1dde6e888aae1bf25688d1e09f85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee49837989db309ffc652c1d2e32f4492b964626b177ae52c6bbdb9b57ca860a",
+        "lastblockhash" : "0xbbcca6ee3b8625309e9e3caebbb00bd937b6064b048d9ff692605e3e4a50499b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d72g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc67cbfae8150fdf91df4f284c05cf97307fe8e0a7b24903514c7ea5f8dfada62",
-                    "mixHash" : "0x9cb6874312ab50624b4ef2e48a222aa32d04f64c893243c9c3db7928c11e3f3c",
-                    "nonce" : "0x0b9173040670c69a",
+                    "hash" : "0xb96056e605c2aa8a5438133e0d055e538ec96b956830785ed08603a263cb1a97",
+                    "mixHash" : "0xebc5e58ea924905cb35e3b6500cd69b76102047c2783ba93423fd31390155b82",
+                    "nonce" : "0xda7383b9435f7d8c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09cb6874312ab50624b4ef2e48a222aa32d04f64c893243c9c3db7928c11e3f3c880b9173040670c69af85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ebc5e58ea924905cb35e3b6500cd69b76102047c2783ba93423fd31390155b8288da7383b9435f7d8cf85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc67cbfae8150fdf91df4f284c05cf97307fe8e0a7b24903514c7ea5f8dfada62",
+        "lastblockhash" : "0xb96056e605c2aa8a5438133e0d055e538ec96b956830785ed08603a263cb1a97",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d72g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d72g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x29f11d367a7028ede9bee00d525b33588849034d99b8327e55dbeed525c735c8",
-                    "mixHash" : "0x49882dbd78459a02b354bf662d5485fb164272c617046a8f3ab80fef96d3c952",
-                    "nonce" : "0x3736d3189d16b13b",
+                    "hash" : "0x17c801c1832b15ceed84c3a5db4da59e1c5eea98741b58f9b91228ef8d4ac7a2",
+                    "mixHash" : "0xb37d11a99248ca9d77074dc7d916c313a7071bdfff8bffcd12b8ac27bb76ad26",
+                    "nonce" : "0xd010d804112f01ca",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a049882dbd78459a02b354bf662d5485fb164272c617046a8f3ab80fef96d3c952883736d3189d16b13bf85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c19349081a4f4548e691ba50e2be00174eae97217417e00467c9ba9c68ec8c7da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b37d11a99248ca9d77074dc7d916c313a7071bdfff8bffcd12b8ac27bb76ad2688d010d804112f01caf85ff85d800183061a8080830186a08e6001600160016001c560006000f31ca0f527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffaa074d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29f11d367a7028ede9bee00d525b33588849034d99b8327e55dbeed525c735c8",
+        "lastblockhash" : "0x17c801c1832b15ceed84c3a5db4da59e1c5eea98741b58f9b91228ef8d4ac7a2",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0.json
index fcce43782..e6865707f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d73g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x36721e1303bc49354eeae643dbc2383219e63264e2643c97138a0edfee4a0a9e",
-                    "mixHash" : "0x6fd6908f84c6c1a3122735e156e3d6256198e47918f2f479cddd670e73074f10",
-                    "nonce" : "0x7949b1c185da27e1",
+                    "hash" : "0x477423e1237dd520b1954023c1a27a3a03917db3f6e67ebfcaa12ba4c3c3ae11",
+                    "mixHash" : "0xa201151d7f8b9b8230aba9ffda428edc9461f6d0bfca498a9fd3d14ab41a652c",
+                    "nonce" : "0x96fc2131bc5d2cd1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06fd6908f84c6c1a3122735e156e3d6256198e47918f2f479cddd670e73074f10887949b1c185da27e1f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a201151d7f8b9b8230aba9ffda428edc9461f6d0bfca498a9fd3d14ab41a652c8896fc2131bc5d2cd1f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36721e1303bc49354eeae643dbc2383219e63264e2643c97138a0edfee4a0a9e",
+        "lastblockhash" : "0x477423e1237dd520b1954023c1a27a3a03917db3f6e67ebfcaa12ba4c3c3ae11",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d73g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x950a674278b3bfb5e8f25246d763141e10b25e88c6cf7b2001b2c4c340da02e3",
-                    "mixHash" : "0x415b271c57a964a2c191823731eaea799b781f6ed572336b738acf16e8142b92",
-                    "nonce" : "0xb0de4fd7b772e2a1",
+                    "hash" : "0x31d142b3030d873c2cfb243d21c2a43a2f317900cde8a597faf0e849d177046e",
+                    "mixHash" : "0x45b4182801e7321c124c16ef11716d1b852d655ac9489ce41472e6438ef7dea2",
+                    "nonce" : "0xac3364382cba8d06",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0415b271c57a964a2c191823731eaea799b781f6ed572336b738acf16e8142b9288b0de4fd7b772e2a1f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a045b4182801e7321c124c16ef11716d1b852d655ac9489ce41472e6438ef7dea288ac3364382cba8d06f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x950a674278b3bfb5e8f25246d763141e10b25e88c6cf7b2001b2c4c340da02e3",
+        "lastblockhash" : "0x31d142b3030d873c2cfb243d21c2a43a2f317900cde8a597faf0e849d177046e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d73g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9ff00ae36914e440d6dacce947370f3527fa7c50daec7ba4ace177bf4cd37aea",
-                    "mixHash" : "0x0501d644896d7fb3f22c62efe113c884ed83f90f9c508fd6795fa38de2799565",
-                    "nonce" : "0x208916218aab8fac",
+                    "hash" : "0x143da5131c39320c9a0b7161329811604585b2a671e5359eddc0942d4dfbda89",
+                    "mixHash" : "0x22199737d9c6cb1358275b6c9f597b8f8b4d9d02fa995e3ac386eb003b1a4706",
+                    "nonce" : "0xc28d1d12f2705177",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00501d644896d7fb3f22c62efe113c884ed83f90f9c508fd6795fa38de279956588208916218aab8facf85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022199737d9c6cb1358275b6c9f597b8f8b4d9d02fa995e3ac386eb003b1a470688c28d1d12f2705177f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ff00ae36914e440d6dacce947370f3527fa7c50daec7ba4ace177bf4cd37aea",
+        "lastblockhash" : "0x143da5131c39320c9a0b7161329811604585b2a671e5359eddc0942d4dfbda89",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d73g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd5e3bd65f6121473c7122736f3a5408f83c3d9321256f5ba679cd33a1b8e2553",
-                    "mixHash" : "0xad5f8d5c5beb1426ef4b15193689cfcf93acd862d2e38baf30dd0e4237398a22",
-                    "nonce" : "0x129b7c33f86f00cf",
+                    "hash" : "0x89e828ffed59172d20716eb5b33f721ff62078214a009341a091f91dbf7ba5cf",
+                    "mixHash" : "0xbb81c3ba6f359621fe1c46519d5246a84e863125f9ca2ee1735b918736df0db1",
+                    "nonce" : "0x8824e94732cada28",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ad5f8d5c5beb1426ef4b15193689cfcf93acd862d2e38baf30dd0e4237398a2288129b7c33f86f00cff85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb81c3ba6f359621fe1c46519d5246a84e863125f9ca2ee1735b918736df0db1888824e94732cada28f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5e3bd65f6121473c7122736f3a5408f83c3d9321256f5ba679cd33a1b8e2553",
+        "lastblockhash" : "0x89e828ffed59172d20716eb5b33f721ff62078214a009341a091f91dbf7ba5cf",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d73g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x001800154527df47d73dae4aa17e78f7d8b8b38337d1511b8c60a707116675f8",
-                    "mixHash" : "0x6e6bfd56f4dd5ebdc1d6dba2895b651077ed1c3116a68a335e552466a9d6d552",
-                    "nonce" : "0x638e50505ee0f6f3",
+                    "hash" : "0x03c449c7711c016f6455b9513df408a7cf75c0b543841cb03606181a54cec9da",
+                    "mixHash" : "0x82715aeca2c1ed43078500a1243e31578f339ed44c07fe91a9f63cf2e7ec932c",
+                    "nonce" : "0xca131090b6574c61",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06e6bfd56f4dd5ebdc1d6dba2895b651077ed1c3116a68a335e552466a9d6d55288638e50505ee0f6f3f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082715aeca2c1ed43078500a1243e31578f339ed44c07fe91a9f63cf2e7ec932c88ca131090b6574c61f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x001800154527df47d73dae4aa17e78f7d8b8b38337d1511b8c60a707116675f8",
+        "lastblockhash" : "0x03c449c7711c016f6455b9513df408a7cf75c0b543841cb03606181a54cec9da",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d73g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d73g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd428f89260a6b97dd26d13192ef2cda1620a2eb693168ded41b8fe858b826278",
-                    "mixHash" : "0xfc86d11ae9126b7bc26b518102b70aec390cffa40cbd6fe259b9c5a6ca0dfa6d",
-                    "nonce" : "0xed3fa68a2b6f6212",
+                    "hash" : "0x77af95c87c8e0d17bdbdc5da0a67077045f4d09a1759d81748ecd5c36ef6f88a",
+                    "mixHash" : "0x5729b2b479a384ccebb15e9c27d0400b7f012ee7441e0fdd449ba1b474d065c3",
+                    "nonce" : "0xe5fe61ea67cfc7d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x28b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fc86d11ae9126b7bc26b518102b70aec390cffa40cbd6fe259b9c5a6ca0dfa6d88ed3fa68a2b6f6212f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea028b83263c21bf6692950706a2332682deefd20ce49129536598ac48c051569d7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05729b2b479a384ccebb15e9c27d0400b7f012ee7441e0fdd449ba1b474d065c388e5fe61ea67cfc7d6f85ff85d800183061a8080830186a08e6001600160016001c660006000f31ba07541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbcaa02c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd428f89260a6b97dd26d13192ef2cda1620a2eb693168ded41b8fe858b826278",
+        "lastblockhash" : "0x77af95c87c8e0d17bdbdc5da0a67077045f4d09a1759d81748ecd5c36ef6f88a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0.json
index 564d790f7..cfae5bd1c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d74g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4c65ca4715cc611d74483b1adec4c22ff462766b02c4b96ef14b9c5250652068",
-                    "mixHash" : "0xfd28151b95f10c45298e8c3c3a686d81520ccfab37513dd3cd4cd3690ee09b87",
-                    "nonce" : "0x4176c77dd45e3d26",
+                    "hash" : "0x0a56c6c9d9454ecae422d2c4aafc7d9bb3ecf46f9133b6666880dec125c4348e",
+                    "mixHash" : "0x6983e311d42567c3fbcded6316ad428f5b975fe2fe0ec4c8bf1eb417caf86fa4",
+                    "nonce" : "0xf32dc953ea4b2520",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fd28151b95f10c45298e8c3c3a686d81520ccfab37513dd3cd4cd3690ee09b87884176c77dd45e3d26f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06983e311d42567c3fbcded6316ad428f5b975fe2fe0ec4c8bf1eb417caf86fa488f32dc953ea4b2520f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c65ca4715cc611d74483b1adec4c22ff462766b02c4b96ef14b9c5250652068",
+        "lastblockhash" : "0x0a56c6c9d9454ecae422d2c4aafc7d9bb3ecf46f9133b6666880dec125c4348e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d74g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x596ca40feda1678029107b51f228694862e86be8ea59a0ea6f9bd7a1f888b3ea",
-                    "mixHash" : "0x7103c96459d9ba4af0c83e0e24fc1b05eb5cb53b8db8ba602291de1eb1bc1beb",
-                    "nonce" : "0x97533704b5e5c5a6",
+                    "hash" : "0x670a7966bf331ff6e294ff9f6d19e16e83b0529e1076e274fe5376ca021bd31a",
+                    "mixHash" : "0x1c66fc9fcf56c8c6f53edb9828dc0c00fff4ef47ea27657d30e0f7b6df84d92c",
+                    "nonce" : "0x9fe3b6e98cef6855",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07103c96459d9ba4af0c83e0e24fc1b05eb5cb53b8db8ba602291de1eb1bc1beb8897533704b5e5c5a6f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01c66fc9fcf56c8c6f53edb9828dc0c00fff4ef47ea27657d30e0f7b6df84d92c889fe3b6e98cef6855f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x596ca40feda1678029107b51f228694862e86be8ea59a0ea6f9bd7a1f888b3ea",
+        "lastblockhash" : "0x670a7966bf331ff6e294ff9f6d19e16e83b0529e1076e274fe5376ca021bd31a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d74g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x009ec979953b690159a7357a476f599e6a08dcf3cc8f3fc4b78eba73074f861c",
-                    "mixHash" : "0xfbbb4631337c3b75bcc28585ad8db2bc161475ca691e88ea91963e9616485f59",
-                    "nonce" : "0xef62f1c45deae808",
+                    "hash" : "0x3f249ce89663e96dc3e58920291f02c5dcd2c88e375426186346198271152dcb",
+                    "mixHash" : "0xdded2979aa15b97305dfacbd5e1675883a90f355b205d4dfff604ab54e90e67b",
+                    "nonce" : "0x29527d609057e023",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fbbb4631337c3b75bcc28585ad8db2bc161475ca691e88ea91963e9616485f5988ef62f1c45deae808f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dded2979aa15b97305dfacbd5e1675883a90f355b205d4dfff604ab54e90e67b8829527d609057e023f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x009ec979953b690159a7357a476f599e6a08dcf3cc8f3fc4b78eba73074f861c",
+        "lastblockhash" : "0x3f249ce89663e96dc3e58920291f02c5dcd2c88e375426186346198271152dcb",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d74g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x821737801a21b232ffeea54a65570ab990e00635ccae033896bbd17c9864c28d",
-                    "mixHash" : "0x4cc4007143503ae9748746606510f0f854280656f50bee3a659f7e6691562688",
-                    "nonce" : "0x3856ae700d68e471",
+                    "hash" : "0x34d73ab2e456a0f076e50dc801bd3f6ab6d4cf3687fab65ba7700eaff6ae74b2",
+                    "mixHash" : "0x129ae3293a5afad365e35e93fa71bc0d3dfe2c22f621c13b1379e642b175fb6e",
+                    "nonce" : "0xd4b7708dff85b0e6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04cc4007143503ae9748746606510f0f854280656f50bee3a659f7e6691562688883856ae700d68e471f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0129ae3293a5afad365e35e93fa71bc0d3dfe2c22f621c13b1379e642b175fb6e88d4b7708dff85b0e6f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x821737801a21b232ffeea54a65570ab990e00635ccae033896bbd17c9864c28d",
+        "lastblockhash" : "0x34d73ab2e456a0f076e50dc801bd3f6ab6d4cf3687fab65ba7700eaff6ae74b2",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d74g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x909fab46ffc4df05d0c94f77e6373b76dffbbe2369f0654664561dbbb0de0ddd",
-                    "mixHash" : "0xb0feafa722a0c06811452573cb0bf84dd9bbed7f35910637eb76ad82fe848bd4",
-                    "nonce" : "0xf7d031a872a16e0a",
+                    "hash" : "0x68db6c4770722f9ffee5a30ecbda2ce4a4f8516b9f1b84f27f801775aacb59ad",
+                    "mixHash" : "0x8dfb569692867b5340627070eae75a18f65fdf3dcedabffe9f1a5067b35f792f",
+                    "nonce" : "0xba73af7bdd248811",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0feafa722a0c06811452573cb0bf84dd9bbed7f35910637eb76ad82fe848bd488f7d031a872a16e0af85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08dfb569692867b5340627070eae75a18f65fdf3dcedabffe9f1a5067b35f792f88ba73af7bdd248811f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x909fab46ffc4df05d0c94f77e6373b76dffbbe2369f0654664561dbbb0de0ddd",
+        "lastblockhash" : "0x68db6c4770722f9ffee5a30ecbda2ce4a4f8516b9f1b84f27f801775aacb59ad",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d74g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d74g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1b3ca000b80911044a740002fb0fd4434160c9c290738fcfba4e280dc840afc2",
-                    "mixHash" : "0x6aeaa01375a43b7dc2cb0f57a1e26c945cbcc0f1693163e718143d21aacbd27c",
-                    "nonce" : "0xc4108167d9f64166",
+                    "hash" : "0xe4636d122499f6c1f875b770da4df21c4697b330fd495a45761722d88dff6ba0",
+                    "mixHash" : "0xa6b6db8d164e61ede0f977516d2c366e5d2ee0ae8690822a1ce9f276caf44997",
+                    "nonce" : "0x17800ef96c8144d2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xa1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06aeaa01375a43b7dc2cb0f57a1e26c945cbcc0f1693163e718143d21aacbd27c88c4108167d9f64166f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1d0203f96119d49a35027cd152c1d8810206ad5867661550138f17d34407414a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a6b6db8d164e61ede0f977516d2c366e5d2ee0ae8690822a1ce9f276caf449978817800ef96c8144d2f85ff85d800183061a8080830186a08e6001600160016001c760006000f31ba0d41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469a00ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b3ca000b80911044a740002fb0fd4434160c9c290738fcfba4e280dc840afc2",
+        "lastblockhash" : "0xe4636d122499f6c1f875b770da4df21c4697b330fd495a45761722d88dff6ba0",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0.json
index bce4ff457..e8ac347e0 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d75g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xeab83e5c8a2a12284013e514a67b03270e8f249cabb9387293a30d90bee4fa3e",
-                    "mixHash" : "0x788a5c8a03ce79e83ac2673467e79a25b77043cba467b272f4df3926842d89ff",
-                    "nonce" : "0xd11b4b2eb04373dc",
+                    "hash" : "0xcd9ff392dced98f3c542d8d08144c8cb2339d713a96305d979cf70c7972e0f5a",
+                    "mixHash" : "0xd21c80bb319f1635c987f311d90909be810e53e2f1267018fc32db746e9de073",
+                    "nonce" : "0x1e2c223b9bd31939",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0788a5c8a03ce79e83ac2673467e79a25b77043cba467b272f4df3926842d89ff88d11b4b2eb04373dcf85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d21c80bb319f1635c987f311d90909be810e53e2f1267018fc32db746e9de073881e2c223b9bd31939f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeab83e5c8a2a12284013e514a67b03270e8f249cabb9387293a30d90bee4fa3e",
+        "lastblockhash" : "0xcd9ff392dced98f3c542d8d08144c8cb2339d713a96305d979cf70c7972e0f5a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d75g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe0f0add62eeea8b934bbb988889474465c90e07be07bef04610603e21eacc112",
-                    "mixHash" : "0x979979cbf7c6faa0eddb3d55ed5602ff37e8d5a9bf58fd33325da98a22516905",
-                    "nonce" : "0x070bd9c85a31ec83",
+                    "hash" : "0xe339dadc24a43c0da90b61c2a184761e62e8a41293e7fc29e28e09a5032ba7e5",
+                    "mixHash" : "0x0441b2a52bb0b6bfb42ca74693f0c44220997fbbf0d787c60661e8afc389c985",
+                    "nonce" : "0xb688931375eefbef",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0979979cbf7c6faa0eddb3d55ed5602ff37e8d5a9bf58fd33325da98a2251690588070bd9c85a31ec83f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00441b2a52bb0b6bfb42ca74693f0c44220997fbbf0d787c60661e8afc389c98588b688931375eefbeff85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0f0add62eeea8b934bbb988889474465c90e07be07bef04610603e21eacc112",
+        "lastblockhash" : "0xe339dadc24a43c0da90b61c2a184761e62e8a41293e7fc29e28e09a5032ba7e5",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d75g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x65d8abd2be66da6644d0841c65c07ef50919c5dcc39ef78af326d2accb38daed",
-                    "mixHash" : "0x815bfe71a55f7b29c40d5e75cc52caa30ec1dc6ace64774d75e43cecf0198a15",
-                    "nonce" : "0xfdcc382fa54f6fda",
+                    "hash" : "0x055c0aeef3caf39e942ac27992bb189585f1ee9788d2b6886d0739084842f5b9",
+                    "mixHash" : "0xd58615143b3d2ac4d722e578466e5003bd9a9da3981d34d92cf91b55935ef37e",
+                    "nonce" : "0x57ddbcb013e41a22",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0815bfe71a55f7b29c40d5e75cc52caa30ec1dc6ace64774d75e43cecf0198a1588fdcc382fa54f6fdaf85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d58615143b3d2ac4d722e578466e5003bd9a9da3981d34d92cf91b55935ef37e8857ddbcb013e41a22f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65d8abd2be66da6644d0841c65c07ef50919c5dcc39ef78af326d2accb38daed",
+        "lastblockhash" : "0x055c0aeef3caf39e942ac27992bb189585f1ee9788d2b6886d0739084842f5b9",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d75g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd1ec62471563d63fa90d9e152eec0c2d08845be07a3798643ea5c1025313692c",
-                    "mixHash" : "0x1f30ec7be8acf3d4ff898a53de32e2d4bc21e4b16d4f942e59e238cdfa404556",
-                    "nonce" : "0xd6f3c3f9d7e5b16e",
+                    "hash" : "0xdfd30aceabc7759a003401e06fb603da62755a0f1479375856ad43a509962165",
+                    "mixHash" : "0x05fca510acbcdeb925011ac7b515eb047a0afaa70343a55a29bac93b8eb47553",
+                    "nonce" : "0xaeb447cb6d510f91",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f30ec7be8acf3d4ff898a53de32e2d4bc21e4b16d4f942e59e238cdfa40455688d6f3c3f9d7e5b16ef85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a005fca510acbcdeb925011ac7b515eb047a0afaa70343a55a29bac93b8eb4755388aeb447cb6d510f91f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1ec62471563d63fa90d9e152eec0c2d08845be07a3798643ea5c1025313692c",
+        "lastblockhash" : "0xdfd30aceabc7759a003401e06fb603da62755a0f1479375856ad43a509962165",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d75g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfe65a94b8c3c4de4c0b90fdda76b22b312df8eafff4831985bbced74f8c8ddac",
-                    "mixHash" : "0x76d8da9299424c3dd381133b9e0d3ba14a881c400dd205f8332b28d5e546315a",
-                    "nonce" : "0x5a79404025e930d4",
+                    "hash" : "0x7e364a199a602044d6b27f570fbfd82f71155f47c3da765d9fa3e835bfe0ada4",
+                    "mixHash" : "0x2072a134c51388095c80568b41bb3a80eace00728f3aad2aa735641d189e758d",
+                    "nonce" : "0x15a9a4d2f9e4845e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a076d8da9299424c3dd381133b9e0d3ba14a881c400dd205f8332b28d5e546315a885a79404025e930d4f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02072a134c51388095c80568b41bb3a80eace00728f3aad2aa735641d189e758d8815a9a4d2f9e4845ef85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe65a94b8c3c4de4c0b90fdda76b22b312df8eafff4831985bbced74f8c8ddac",
+        "lastblockhash" : "0x7e364a199a602044d6b27f570fbfd82f71155f47c3da765d9fa3e835bfe0ada4",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d75g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d75g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x60ddcbb02239956450a0dd8716008f0a1d88045caee6aaea987e6c74d94c8b57",
-                    "mixHash" : "0x7aded6864f9876518d1a0fca9fd92643d9e425a5dcebbf297f8f692d048e03ec",
-                    "nonce" : "0xf92dbf0f130f5b9c",
+                    "hash" : "0x84869dbc4d95bc79672113ac8ffcbeafd01008fccae4037524afcba2daa30d71",
+                    "mixHash" : "0x6ffd5683959abe77b1bfe100701bdc8f1120a841621377c2e08313006bb30870",
+                    "nonce" : "0xae64fb6c33af93c0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07aded6864f9876518d1a0fca9fd92643d9e425a5dcebbf297f8f692d048e03ec88f92dbf0f130f5b9cf85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0581834f7f14852d3de6471699abb5742bee251104b9b131a7186c56228a74674a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ffd5683959abe77b1bfe100701bdc8f1120a841621377c2e08313006bb3087088ae64fb6c33af93c0f85ff85d800183061a8080830186a08e6001600160016001c860006000f31ba0b4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8a047fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60ddcbb02239956450a0dd8716008f0a1d88045caee6aaea987e6c74d94c8b57",
+        "lastblockhash" : "0x84869dbc4d95bc79672113ac8ffcbeafd01008fccae4037524afcba2daa30d71",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0.json
index e2bb5eb0e..4d3fd1559 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d76g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbab30ed32e13f13f4b435878a0303385d745b3044d2959f7db52d5588dd4e6fb",
-                    "mixHash" : "0xe5170d9d765c2a287396a890317a40017e7cf8a021b25fe2f54c56649db97136",
-                    "nonce" : "0x1d9a5d4d52ad815f",
+                    "hash" : "0xb9f6cfeb9640643f9e41027c729be6da26978b0540e51b0a5cf59ecbc78f0d5f",
+                    "mixHash" : "0x3d5e2e74c8f63e813bb4a1837a5005e0565210f417d268523cbce137afa7de28",
+                    "nonce" : "0x9e48fc7f8fba494d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e5170d9d765c2a287396a890317a40017e7cf8a021b25fe2f54c56649db97136881d9a5d4d52ad815ff85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03d5e2e74c8f63e813bb4a1837a5005e0565210f417d268523cbce137afa7de28889e48fc7f8fba494df85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbab30ed32e13f13f4b435878a0303385d745b3044d2959f7db52d5588dd4e6fb",
+        "lastblockhash" : "0xb9f6cfeb9640643f9e41027c729be6da26978b0540e51b0a5cf59ecbc78f0d5f",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d76g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1e5a26590aff24a79bdb1f21ffbbe65ecd190fb31e80970187374117dcdfb4a8",
-                    "mixHash" : "0x0f776e91d9fd7fbcbcac802a25540eebbf79f7ef895d521d69819a4b863eb521",
-                    "nonce" : "0xed2dae3606aeee8c",
+                    "hash" : "0x96cd43a5d6694908e4618a214e5ccf6476f6fe9c037df20abeea50421469db8a",
+                    "mixHash" : "0x1a74cfc7246c850a453abd9e1c63e4bbabe0ce4b925244b9150b559801d34e4d",
+                    "nonce" : "0x3331658b72f70633",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00f776e91d9fd7fbcbcac802a25540eebbf79f7ef895d521d69819a4b863eb52188ed2dae3606aeee8cf85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01a74cfc7246c850a453abd9e1c63e4bbabe0ce4b925244b9150b559801d34e4d883331658b72f70633f85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1e5a26590aff24a79bdb1f21ffbbe65ecd190fb31e80970187374117dcdfb4a8",
+        "lastblockhash" : "0x96cd43a5d6694908e4618a214e5ccf6476f6fe9c037df20abeea50421469db8a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d76g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd1ae5640b3ef0cb643081f15323b900769636d9330348efa99507f72bf0a967f",
-                    "mixHash" : "0x9edea0e4e557308ad33ebbff262f5662325a84e831c8cb2a1e2faa2a45e1aa4a",
-                    "nonce" : "0x3d9072b72ade7ed8",
+                    "hash" : "0xd682ca427c699657e90f649c8c1b68eab1b537ea5467367c40432db55c485c31",
+                    "mixHash" : "0x8dffbc6350a3303e934f8698d0c352e3a08ac21590d77635c7a62602277c9d65",
+                    "nonce" : "0x5763b103d26d5a6c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09edea0e4e557308ad33ebbff262f5662325a84e831c8cb2a1e2faa2a45e1aa4a883d9072b72ade7ed8f85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08dffbc6350a3303e934f8698d0c352e3a08ac21590d77635c7a62602277c9d65885763b103d26d5a6cf85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1ae5640b3ef0cb643081f15323b900769636d9330348efa99507f72bf0a967f",
+        "lastblockhash" : "0xd682ca427c699657e90f649c8c1b68eab1b537ea5467367c40432db55c485c31",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d76g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x18340ed2e874dccbb490fa454e154e8a749f939dfc3df72c5507a77b457e6035",
-                    "mixHash" : "0xb0f9e57e43c6075db280ba8fedd982390fce159f705279b91e901c9107bd6c30",
-                    "nonce" : "0x348522141c508e01",
+                    "hash" : "0x4dcccd713c3eb792cd89798f7b5eeb36c331b5012ac02725bc06522f87d211e6",
+                    "mixHash" : "0xee9fe15883dd83504d1892bc8989396bf3fb38da0cf37986b383dffd884c4846",
+                    "nonce" : "0x79c0a47d4b38681a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0f9e57e43c6075db280ba8fedd982390fce159f705279b91e901c9107bd6c3088348522141c508e01f85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ee9fe15883dd83504d1892bc8989396bf3fb38da0cf37986b383dffd884c48468879c0a47d4b38681af85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18340ed2e874dccbb490fa454e154e8a749f939dfc3df72c5507a77b457e6035",
+        "lastblockhash" : "0x4dcccd713c3eb792cd89798f7b5eeb36c331b5012ac02725bc06522f87d211e6",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d76g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x91ae1d440595a72302d6086f55063ab93be2517b9360a75c20b1c17bc0118b9c",
-                    "mixHash" : "0x67d1e32cb33fa77217e5022ca94c497038534fac74a87b04268d123e54406ba3",
-                    "nonce" : "0xfdd457637e1af57f",
+                    "hash" : "0xbc6f3929530c803cf113a6884deeab5cdeab2bba42c94454e62619a33272a296",
+                    "mixHash" : "0xe346975d938ae2756a2d6c4308dc087e5467d2ebc22650cfaa51b06829292eb1",
+                    "nonce" : "0x39d32a6d2ceefa9a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a067d1e32cb33fa77217e5022ca94c497038534fac74a87b04268d123e54406ba388fdd457637e1af57ff85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e346975d938ae2756a2d6c4308dc087e5467d2ebc22650cfaa51b06829292eb18839d32a6d2ceefa9af85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91ae1d440595a72302d6086f55063ab93be2517b9360a75c20b1c17bc0118b9c",
+        "lastblockhash" : "0xbc6f3929530c803cf113a6884deeab5cdeab2bba42c94454e62619a33272a296",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d76g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d76g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x46f861264de983a94fa8b216425d8e1c72f64c188d88eb062a61d35f5be0dedf",
-                    "mixHash" : "0x8b43f94a4bc80c361a02c835eb076e28e1706e7d00c0e6511311361e0c3056e6",
-                    "nonce" : "0x815ba38c46a104b4",
+                    "hash" : "0x9fb9c17f47b987b89ecb63041b91b66c1208f15527fc3c29e2208835f450f186",
+                    "mixHash" : "0xa63519466353e68ee61947148c3be72d5a960af4ff232e841cc2319052008105",
+                    "nonce" : "0x3c11c5a8c21359e0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08b43f94a4bc80c361a02c835eb076e28e1706e7d00c0e6511311361e0c3056e688815ba38c46a104b4f85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c46d79ec02c3e3aebf141a80e4d59f08cdc184b6e556029fc3ab2ef5114a4993a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a63519466353e68ee61947148c3be72d5a960af4ff232e841cc2319052008105883c11c5a8c21359e0f85ff85d800183061a8080830186a08e6001600160016001c960006000f31ca0bace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cca01db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001c960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46f861264de983a94fa8b216425d8e1c72f64c188d88eb062a61d35f5be0dedf",
+        "lastblockhash" : "0x9fb9c17f47b987b89ecb63041b91b66c1208f15527fc3c29e2208835f450f186",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0.json
index f3e506ff0..7d6be5284 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d77g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b516722baf8d877cd10c4f2817f4fb5d864afcb067c2f3b5587773ac88d5bb4",
-                    "mixHash" : "0x8877a19375f2030b993731b906df6d005dbbab8a31e470b73f95afc230c83dc7",
-                    "nonce" : "0xbd419c2cba14395b",
+                    "hash" : "0xbdba294400eec2cec18eca623faaf4a993014f5aa57a86cdace220ddc75596dd",
+                    "mixHash" : "0xb47580b9f9e38394107b87f109d2e6274ca60875f74edb953ffb8d3a71c90846",
+                    "nonce" : "0x6efb1db7a327df52",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08877a19375f2030b993731b906df6d005dbbab8a31e470b73f95afc230c83dc788bd419c2cba14395bf85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b47580b9f9e38394107b87f109d2e6274ca60875f74edb953ffb8d3a71c90846886efb1db7a327df52f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b516722baf8d877cd10c4f2817f4fb5d864afcb067c2f3b5587773ac88d5bb4",
+        "lastblockhash" : "0xbdba294400eec2cec18eca623faaf4a993014f5aa57a86cdace220ddc75596dd",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d77g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5c0f0cd6cf2b4001d636f6eb16447628743962fddf7b87ca5fdf852a8b87e5ed",
-                    "mixHash" : "0x9d066af1cf839b3141359ce42a06f20d068933bd7787e5b0e85bf69adb88f9fa",
-                    "nonce" : "0xc01659e2e0d6499c",
+                    "hash" : "0x69b494a914cf58abe5d139f78602c2d0b22eb6b8dfe57b1690c184a058727d51",
+                    "mixHash" : "0xe30a0ebbf387efca390450c273cdc25b5a261be083428f9b03d00cd63640b612",
+                    "nonce" : "0x60f81750e83659c2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09d066af1cf839b3141359ce42a06f20d068933bd7787e5b0e85bf69adb88f9fa88c01659e2e0d6499cf85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e30a0ebbf387efca390450c273cdc25b5a261be083428f9b03d00cd63640b6128860f81750e83659c2f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c0f0cd6cf2b4001d636f6eb16447628743962fddf7b87ca5fdf852a8b87e5ed",
+        "lastblockhash" : "0x69b494a914cf58abe5d139f78602c2d0b22eb6b8dfe57b1690c184a058727d51",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d77g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc1a7fc95b19a1b60b4b00edf4b447b862911f70249e154d24b04ba0eb291575a",
-                    "mixHash" : "0x0a497c3c922b947fe5277fb60abbd0a31567a93749346242684d7a6a03f5ccc9",
-                    "nonce" : "0x08ade850b953895c",
+                    "hash" : "0xfe8cac250a05977b6f3acb7d8553f762bfd6d11646216f1110e482c2e7b9e565",
+                    "mixHash" : "0x19ad54e1bc826b8e8b9664f11ab0dad572b4ead9fac1472c23f6ff9c336f92ae",
+                    "nonce" : "0xd3852bec6f423138",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00a497c3c922b947fe5277fb60abbd0a31567a93749346242684d7a6a03f5ccc98808ade850b953895cf85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a019ad54e1bc826b8e8b9664f11ab0dad572b4ead9fac1472c23f6ff9c336f92ae88d3852bec6f423138f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1a7fc95b19a1b60b4b00edf4b447b862911f70249e154d24b04ba0eb291575a",
+        "lastblockhash" : "0xfe8cac250a05977b6f3acb7d8553f762bfd6d11646216f1110e482c2e7b9e565",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d77g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x24bcdc6274ffe38801f2adcf0ae2ec36bd1e239e6b66d2755ce0a7b603a5943b",
-                    "mixHash" : "0x9baf4782a1d81c9cb5bff7340888c714474ea770a3fc1b0c7cea7117661914fb",
-                    "nonce" : "0xbd508ca98aa3aa58",
+                    "hash" : "0x32e8f7c393f873e9cc6c02458626c0275c8769e309e66e34008ca4b96630445b",
+                    "mixHash" : "0x41c1d74c42211382834992dbee21eb72c8908c3ae7bd1381b0c6f769d9ae63c0",
+                    "nonce" : "0x4ce8b7c3df9d540f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09baf4782a1d81c9cb5bff7340888c714474ea770a3fc1b0c7cea7117661914fb88bd508ca98aa3aa58f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a041c1d74c42211382834992dbee21eb72c8908c3ae7bd1381b0c6f769d9ae63c0884ce8b7c3df9d540ff85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24bcdc6274ffe38801f2adcf0ae2ec36bd1e239e6b66d2755ce0a7b603a5943b",
+        "lastblockhash" : "0x32e8f7c393f873e9cc6c02458626c0275c8769e309e66e34008ca4b96630445b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d77g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xafb4cfcf3698d4d2ab7b12b5b5a8bf19ebd4cf399969afbcef5c82b8a9d9968b",
-                    "mixHash" : "0x3754490371418edfc8c871b5d966e2613e9ec9d3db29944f6750b6c9f31a2197",
-                    "nonce" : "0xd150203c65d65dd3",
+                    "hash" : "0xbc8da3cfb5deffb6a10dea6e0451b4e8ca137cdc5140f31f8e44f5723bb0ab39",
+                    "mixHash" : "0xc5b19ac084404868dbb716261f3daacc2e3bed3fa15aa907719af469d3374147",
+                    "nonce" : "0xce5efd9db0916f51",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03754490371418edfc8c871b5d966e2613e9ec9d3db29944f6750b6c9f31a219788d150203c65d65dd3f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c5b19ac084404868dbb716261f3daacc2e3bed3fa15aa907719af469d337414788ce5efd9db0916f51f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafb4cfcf3698d4d2ab7b12b5b5a8bf19ebd4cf399969afbcef5c82b8a9d9968b",
+        "lastblockhash" : "0xbc8da3cfb5deffb6a10dea6e0451b4e8ca137cdc5140f31f8e44f5723bb0ab39",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d77g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d77g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcf4f193365c925a91bf36c6a3be0b43285e6a08811ff4283a45110cf2f97ba54",
-                    "mixHash" : "0xe5eadd5e5af9f1306245c781bb641e3d5e2b7da8b6ec8423734be3694c9f4fb1",
-                    "nonce" : "0xd556bc1c818c8cb0",
+                    "hash" : "0x64843bcb8ba4bf13f7a2d102ee544e94a1f42d3bd6d53391ed6e9e5bc5f0963c",
+                    "mixHash" : "0x49919cdbe796addf689f90ffb837596ccb5ea4e10e09e0006efc42b79d190f5e",
+                    "nonce" : "0xecc447e9f9e43348",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x2efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e5eadd5e5af9f1306245c781bb641e3d5e2b7da8b6ec8423734be3694c9f4fb188d556bc1c818c8cb0f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
+                "rlp" : "0xf9025cf901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02efc0903bc02d94a1c8b677f5ebb518feecd11897ea59747723c84082c386ad2a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a049919cdbe796addf689f90ffb837596ccb5ea4e10e09e0006efc42b79d190f5e88ecc447e9f9e43348f85ef85c800183061a8080830186a08e6001600160016001ca60006000f31ba04cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa9fe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ca60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf4f193365c925a91bf36c6a3be0b43285e6a08811ff4283a45110cf2f97ba54",
+        "lastblockhash" : "0x64843bcb8ba4bf13f7a2d102ee544e94a1f42d3bd6d53391ed6e9e5bc5f0963c",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0.json
index f4a59102a..3974773f2 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d78g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe55f8d6bf180f3800077d618402cf3fa24015207d9024204c09ce07fb1d42e26",
-                    "mixHash" : "0x78d47bb0b3584ef6bcfbd7a44bfb3e9533e593cc119ec8ac1fdd2139e513505a",
-                    "nonce" : "0xaee66ec1b5da8be7",
+                    "hash" : "0x64ad6ff2578e012ff5293133641b65cc0d6f97da34c9d5fdeffa0398e5ba93b4",
+                    "mixHash" : "0x44a4f79f3155d3c212464bbdd5ebe8fa1cee93dc7254bc8daf7b28ee28381b54",
+                    "nonce" : "0xb0f705be657ae80b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a078d47bb0b3584ef6bcfbd7a44bfb3e9533e593cc119ec8ac1fdd2139e513505a88aee66ec1b5da8be7f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a044a4f79f3155d3c212464bbdd5ebe8fa1cee93dc7254bc8daf7b28ee28381b5488b0f705be657ae80bf85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe55f8d6bf180f3800077d618402cf3fa24015207d9024204c09ce07fb1d42e26",
+        "lastblockhash" : "0x64ad6ff2578e012ff5293133641b65cc0d6f97da34c9d5fdeffa0398e5ba93b4",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d78g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xffe1a311b6952595091086f56f1e6e0e376b7332b03d8dbb163d83fcdd0e7f49",
-                    "mixHash" : "0x1830b9dec71efbbd62ac86d3672f952cd735611c2a8ea8ff1c049e6a0b24c261",
-                    "nonce" : "0x2002e5089f30f177",
+                    "hash" : "0xca75853762a63d90bf7ea1cc823967147f2cd5c712757c5b54b89a5be99f3d44",
+                    "mixHash" : "0x18c8c5a7127aa56c7b93ef7cac5420e3451cd871cba145166ae16aaab2c0c074",
+                    "nonce" : "0x85c05f52d9964d09",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01830b9dec71efbbd62ac86d3672f952cd735611c2a8ea8ff1c049e6a0b24c261882002e5089f30f177f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a018c8c5a7127aa56c7b93ef7cac5420e3451cd871cba145166ae16aaab2c0c0748885c05f52d9964d09f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffe1a311b6952595091086f56f1e6e0e376b7332b03d8dbb163d83fcdd0e7f49",
+        "lastblockhash" : "0xca75853762a63d90bf7ea1cc823967147f2cd5c712757c5b54b89a5be99f3d44",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d78g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdf33c3ef4c067eb2178c11f8826a2a71ea319b9d1f3682fb5d1458db4b824210",
-                    "mixHash" : "0x5f84fc8e29c990bd8f044df1ffd4c1b8db10925fc586a3eb77dacb38be760034",
-                    "nonce" : "0x58ca68f7f8563c57",
+                    "hash" : "0xe117173c6ce6cf2fb6c719b3e4744ec6117a668c63e14ea4fb28ad2d6a93a618",
+                    "mixHash" : "0x80b9f4d9b57164eef2828cfd336095354d1a63a3ff12a0796482083743d145e3",
+                    "nonce" : "0xfb9af444227c7bcb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05f84fc8e29c990bd8f044df1ffd4c1b8db10925fc586a3eb77dacb38be7600348858ca68f7f8563c57f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a080b9f4d9b57164eef2828cfd336095354d1a63a3ff12a0796482083743d145e388fb9af444227c7bcbf85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf33c3ef4c067eb2178c11f8826a2a71ea319b9d1f3682fb5d1458db4b824210",
+        "lastblockhash" : "0xe117173c6ce6cf2fb6c719b3e4744ec6117a668c63e14ea4fb28ad2d6a93a618",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d78g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x92acff3b81f6ab71802f145a7622f49525cd180c15f3cf7e3850f55c0789a900",
-                    "mixHash" : "0xa72fb99ef66cce917239f8363829ef353764623b8c53b07d6aae094e7b7e8f7c",
-                    "nonce" : "0x08db5ce85e9bd7d8",
+                    "hash" : "0xc5c37e9543bfca5cbe18edde51d6f15ea75ee03f8ad0bd24751a736d14858528",
+                    "mixHash" : "0x8607c025dd409ce9e4aca99d0c8de98ec2f69a50c5dcf9f4687e93fd6e480abf",
+                    "nonce" : "0xe38d2974fb9f15bc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a72fb99ef66cce917239f8363829ef353764623b8c53b07d6aae094e7b7e8f7c8808db5ce85e9bd7d8f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08607c025dd409ce9e4aca99d0c8de98ec2f69a50c5dcf9f4687e93fd6e480abf88e38d2974fb9f15bcf85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92acff3b81f6ab71802f145a7622f49525cd180c15f3cf7e3850f55c0789a900",
+        "lastblockhash" : "0xc5c37e9543bfca5cbe18edde51d6f15ea75ee03f8ad0bd24751a736d14858528",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d78g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa9cd311c4b513a768d6cc46d67479d0802896a51e926ed712b714fff9c90b7b0",
-                    "mixHash" : "0xc953ec007dfafd11c64b71ee0f67023ccc5bc69dc41e0772fb51ae3cc0c8849c",
-                    "nonce" : "0x717614d4ed06db38",
+                    "hash" : "0xea70420f285c996ca190faf2451597cf5646c0063f37437cc33f860722a3ed78",
+                    "mixHash" : "0x77305dba0678626d49ecf6562a123a7322c3d1f8b9a246a0237a3f8de593bba4",
+                    "nonce" : "0xa0ade153b078c178",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c953ec007dfafd11c64b71ee0f67023ccc5bc69dc41e0772fb51ae3cc0c8849c88717614d4ed06db38f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a077305dba0678626d49ecf6562a123a7322c3d1f8b9a246a0237a3f8de593bba488a0ade153b078c178f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9cd311c4b513a768d6cc46d67479d0802896a51e926ed712b714fff9c90b7b0",
+        "lastblockhash" : "0xea70420f285c996ca190faf2451597cf5646c0063f37437cc33f860722a3ed78",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d78g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d78g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2c08b00d6f28c04f821cee10729a5baa50d7aa85f809b098d51c234166de0666",
-                    "mixHash" : "0xd5c621552567db61a8c3f3c7df110b2e5850672ba007cf1919d46356d3af282f",
-                    "nonce" : "0xd42575899137b222",
+                    "hash" : "0xf87096f544ae1052a28d7e19d15a7cd6fe8bd0fe8f0c4040ec2e68cccdd22311",
+                    "mixHash" : "0x685e6fecbcc5da342ba279f0797ee1e1f9a73e3187a9b1944b8c36187b38c7b3",
+                    "nonce" : "0x56521cb3c91bf624",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xefd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d5c621552567db61a8c3f3c7df110b2e5850672ba007cf1919d46356d3af282f88d42575899137b222f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0efd2080b41dc0a2c6b4b916c3ac0adc5c0e95d3c7d66aba24f91745c775eef9fa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0685e6fecbcc5da342ba279f0797ee1e1f9a73e3187a9b1944b8c36187b38c7b38856521cb3c91bf624f85ff85d800183061a8080830186a08e6001600160016001cb60006000f31ba00ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623fa00599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cb60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c08b00d6f28c04f821cee10729a5baa50d7aa85f809b098d51c234166de0666",
+        "lastblockhash" : "0xf87096f544ae1052a28d7e19d15a7cd6fe8bd0fe8f0c4040ec2e68cccdd22311",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0.json
index 95afffe7f..1e26e625f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d79g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x91525b7dc3bd3da92ce5706fe192bb2fd5890ef158439c17591b3d1350208354",
-                    "mixHash" : "0x3a83280f73941cf47a590db4cf7d284211eb703eac872fd0b65aa84376b43a60",
-                    "nonce" : "0x2c305b5263de8f80",
+                    "hash" : "0x98a2f5fb03f20991ab332090ae789efb1dbb25bec2670e398dbee3ffe97a5d29",
+                    "mixHash" : "0x8202867395ea21b11b553581ebac66ea1abd36a30f8586dc57347a93de6da243",
+                    "nonce" : "0x74f2b6081169d6e2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03a83280f73941cf47a590db4cf7d284211eb703eac872fd0b65aa84376b43a60882c305b5263de8f80f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08202867395ea21b11b553581ebac66ea1abd36a30f8586dc57347a93de6da2438874f2b6081169d6e2f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91525b7dc3bd3da92ce5706fe192bb2fd5890ef158439c17591b3d1350208354",
+        "lastblockhash" : "0x98a2f5fb03f20991ab332090ae789efb1dbb25bec2670e398dbee3ffe97a5d29",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d79g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd93d99aa3f5e85c2543e64412dff0b0a4d8b7451edfa07db9d4d59e867f37aa3",
-                    "mixHash" : "0xe186ea7b683e7f522df4f6ae5a0914decc2e09d3bcd313a4a8618ff4d0e6ae9b",
-                    "nonce" : "0x204dac26eeaddaf5",
+                    "hash" : "0xb3881c66b7c7a3a0447c5038fba2c8b9bb4365a20ce60533fe6b1ed4578d6e90",
+                    "mixHash" : "0x8919af8d905885be7abe14c576d1e79ceac595e2001ec15436d0cb9646ca0ed2",
+                    "nonce" : "0x416c94583f9e65d1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e186ea7b683e7f522df4f6ae5a0914decc2e09d3bcd313a4a8618ff4d0e6ae9b88204dac26eeaddaf5f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08919af8d905885be7abe14c576d1e79ceac595e2001ec15436d0cb9646ca0ed288416c94583f9e65d1f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd93d99aa3f5e85c2543e64412dff0b0a4d8b7451edfa07db9d4d59e867f37aa3",
+        "lastblockhash" : "0xb3881c66b7c7a3a0447c5038fba2c8b9bb4365a20ce60533fe6b1ed4578d6e90",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d79g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x02e9dbfc925ccde484e301983fb638d18c9331152369994a24ac56d773a50e62",
-                    "mixHash" : "0xd2634e6704e0eeb34c47e78091eb35d1ec22764a56f544fbf79cefe066b6f462",
-                    "nonce" : "0x9e49e5ef91a63542",
+                    "hash" : "0x0e1919d625d54dfa98f8fec536b4ab5ad8fd96d6f98b807ca58e63c75ecdcb77",
+                    "mixHash" : "0x7f46c612ab5f49dc1248af8c71dbeb8d05d8d5aa5f43c00b4068dfc415e52045",
+                    "nonce" : "0x8e6e92ffe42548ac",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d2634e6704e0eeb34c47e78091eb35d1ec22764a56f544fbf79cefe066b6f462889e49e5ef91a63542f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f46c612ab5f49dc1248af8c71dbeb8d05d8d5aa5f43c00b4068dfc415e52045888e6e92ffe42548acf85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02e9dbfc925ccde484e301983fb638d18c9331152369994a24ac56d773a50e62",
+        "lastblockhash" : "0x0e1919d625d54dfa98f8fec536b4ab5ad8fd96d6f98b807ca58e63c75ecdcb77",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d79g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdc29bd2567b0b9a4958adec40bb8f2c09179c003663e4b9d558de422e6902983",
-                    "mixHash" : "0x4efcfb28c959c82b4ef83cb0bbf3e6017cad9d510dd28db46d3eb06e0cc59ef2",
-                    "nonce" : "0x048f0181b6d631e4",
+                    "hash" : "0xb511aac61ecd5a7748e5288aa9ca812a7461e91800ca1c7da27ce9cbd9cc9435",
+                    "mixHash" : "0x1c6cd1447c1c5f2ef7f0498b6324e9cbbcd56f45baee406b9226f302c87f9dcc",
+                    "nonce" : "0x149d0c1e0e3ddf7f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04efcfb28c959c82b4ef83cb0bbf3e6017cad9d510dd28db46d3eb06e0cc59ef288048f0181b6d631e4f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01c6cd1447c1c5f2ef7f0498b6324e9cbbcd56f45baee406b9226f302c87f9dcc88149d0c1e0e3ddf7ff85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc29bd2567b0b9a4958adec40bb8f2c09179c003663e4b9d558de422e6902983",
+        "lastblockhash" : "0xb511aac61ecd5a7748e5288aa9ca812a7461e91800ca1c7da27ce9cbd9cc9435",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d79g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6554836e7357f8a72f47038a475b1dc4c6c5fd99cc9463902e2aa6a1d190e5ee",
-                    "mixHash" : "0x3666d880cb6ea7e9f203317a7729afeeebca5f29b57f8f12e684d72b1732e194",
-                    "nonce" : "0xcfe685c6d7158434",
+                    "hash" : "0xfb855f3c00022646ca8adca418363828ce6bf6ce89a845b4f42400ef568f24be",
+                    "mixHash" : "0xffc4497a31c86f6ae4f83aff2bb439baf3ae3a9d9a9f3036050395050ecee420",
+                    "nonce" : "0x1606c3806c73c5bf",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03666d880cb6ea7e9f203317a7729afeeebca5f29b57f8f12e684d72b1732e19488cfe685c6d7158434f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffc4497a31c86f6ae4f83aff2bb439baf3ae3a9d9a9f3036050395050ecee420881606c3806c73c5bff85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6554836e7357f8a72f47038a475b1dc4c6c5fd99cc9463902e2aa6a1d190e5ee",
+        "lastblockhash" : "0xfb855f3c00022646ca8adca418363828ce6bf6ce89a845b4f42400ef568f24be",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d79g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d79g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfcf3b5e217fd0a4a86a90594bcf4c5ca806b48e2be539182943c592c00e6c4ee",
-                    "mixHash" : "0x1bceb666f6a5dc243b23f7444512b657354bc826585c75fbeb6ffc809651df6a",
-                    "nonce" : "0x054cca33be6c4b61",
+                    "hash" : "0x28faa790c749b2328561a2a7df9527d03b974d39740bd91f624b5531ce4e4127",
+                    "mixHash" : "0x190408d17f5eb8122b3ad84899dcd7398f940cd5b1393b1ac573fe9663d274e4",
+                    "nonce" : "0x081c407adefdf731",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x2ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01bceb666f6a5dc243b23f7444512b657354bc826585c75fbeb6ffc809651df6a88054cca33be6c4b61f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02ae345c2827040d742482e6f793bd4e1b6a017ffb0aa55164ba5003c941d7c98a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0190408d17f5eb8122b3ad84899dcd7398f940cd5b1393b1ac573fe9663d274e488081c407adefdf731f85ff85d800183061a8080830186a08e6001600160016001cc60006000f31ba01ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10aa0784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511efc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cc60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfcf3b5e217fd0a4a86a90594bcf4c5ca806b48e2be539182943c592c00e6c4ee",
+        "lastblockhash" : "0x28faa790c749b2328561a2a7df9527d03b974d39740bd91f624b5531ce4e4127",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0.json
index 47d9e53ec..bc862d65f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d7g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdfd68e05b88d4ff492a3f4dc81bde977cea0e59ff47548e76e4e74bd62bec73f",
-                    "mixHash" : "0x0cbea5ea213fb07ef68d127a71bebe15947ebcdc3761d7d7f55325fb77ca09aa",
-                    "nonce" : "0x48696a834778f598",
+                    "hash" : "0x175ab86ddb48037b646e8097ebace856be360b98dd264b092ccc341b2c64a3e9",
+                    "mixHash" : "0x30db589236da704af0030a8f71ed543a955827bf879dd0b1d2d277c24702c1f7",
+                    "nonce" : "0xddd72ddeb48f4956",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00cbea5ea213fb07ef68d127a71bebe15947ebcdc3761d7d7f55325fb77ca09aa8848696a834778f598f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a030db589236da704af0030a8f71ed543a955827bf879dd0b1d2d277c24702c1f788ddd72ddeb48f4956f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfd68e05b88d4ff492a3f4dc81bde977cea0e59ff47548e76e4e74bd62bec73f",
+        "lastblockhash" : "0x175ab86ddb48037b646e8097ebace856be360b98dd264b092ccc341b2c64a3e9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d7g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb1f00759315f945f6f2dd3bedecea1a1f069c6e36e38ede2981949b1a81ed8e9",
-                    "mixHash" : "0x47bf0807726a65adea9ceb65454e1588ef3693d0813f748258f0e0fc50585878",
-                    "nonce" : "0x6318f54eca584aca",
+                    "hash" : "0x52eb801cfbcad1a2500286159a2ecff67e893bb333249c71f477c22cb71bf029",
+                    "mixHash" : "0x0d7244e09e243d58d9c080a96c0675b31ac10d78b6622d0f94154460402287b7",
+                    "nonce" : "0x602c6e235faf8add",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a047bf0807726a65adea9ceb65454e1588ef3693d0813f748258f0e0fc50585878886318f54eca584acaf85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d7244e09e243d58d9c080a96c0675b31ac10d78b6622d0f94154460402287b788602c6e235faf8addf85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1f00759315f945f6f2dd3bedecea1a1f069c6e36e38ede2981949b1a81ed8e9",
+        "lastblockhash" : "0x52eb801cfbcad1a2500286159a2ecff67e893bb333249c71f477c22cb71bf029",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d7g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x34703fc0a157f8a6c56b04443d02205d601db27c9d25443ad9018b007579e7c9",
-                    "mixHash" : "0xde7a98afbcce535c3a4f1f5ddd4882f0c26d7ecd9e8b9198a7f099f0c8d41b1d",
-                    "nonce" : "0xbbb7622f6acbf89e",
+                    "hash" : "0xcd897cb2207fce5fac616a12e79c1f76bae0d87c35a68b41932e7138c56d362c",
+                    "mixHash" : "0x3290dfb47abadddd035f8017ac7c248fede60e6fc431d7bb4fb248e98994f514",
+                    "nonce" : "0x8c1ad0c38e596880",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0de7a98afbcce535c3a4f1f5ddd4882f0c26d7ecd9e8b9198a7f099f0c8d41b1d88bbb7622f6acbf89ef85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03290dfb47abadddd035f8017ac7c248fede60e6fc431d7bb4fb248e98994f514888c1ad0c38e596880f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34703fc0a157f8a6c56b04443d02205d601db27c9d25443ad9018b007579e7c9",
+        "lastblockhash" : "0xcd897cb2207fce5fac616a12e79c1f76bae0d87c35a68b41932e7138c56d362c",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d7g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x85e3bb1867b841190c34a4ceed1b9ed2552d488afd700ee32757cbe1ab978196",
-                    "mixHash" : "0xab9d86910f1a7388d57964cb83d92aace0067010ba69a77e5687fdb3b9a9bd5d",
-                    "nonce" : "0x9ea96f92957c562d",
+                    "hash" : "0x3dfffa11c1e2726abcf023a1a093652122170a33414d113ef8382d660556c3bc",
+                    "mixHash" : "0xff9d81f37fe990c8de4fad1ad71d5bbc82208b0401e8af0135b9e9640cf97c47",
+                    "nonce" : "0x28dfc3e63615e0f9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab9d86910f1a7388d57964cb83d92aace0067010ba69a77e5687fdb3b9a9bd5d889ea96f92957c562df85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ff9d81f37fe990c8de4fad1ad71d5bbc82208b0401e8af0135b9e9640cf97c478828dfc3e63615e0f9f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85e3bb1867b841190c34a4ceed1b9ed2552d488afd700ee32757cbe1ab978196",
+        "lastblockhash" : "0x3dfffa11c1e2726abcf023a1a093652122170a33414d113ef8382d660556c3bc",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d7g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5a2df6a66f48882ec4817a9e5c9030cd159b2f1284eaf08491182bcac617bb02",
-                    "mixHash" : "0x1f81d321e1bc34711a6e753358802c3effc958f939a300e13ea7daafb714383b",
-                    "nonce" : "0x73c07f4b859418b9",
+                    "hash" : "0x197302110e88dfd58189340042255738321348f3e70735edc9557c022a1ccc79",
+                    "mixHash" : "0xa4baf499391fab6c5102acb90914068b8147c73b00d121b579a0f375e2a4939c",
+                    "nonce" : "0x5722bb8758d54b26",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f81d321e1bc34711a6e753358802c3effc958f939a300e13ea7daafb714383b8873c07f4b859418b9f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a4baf499391fab6c5102acb90914068b8147c73b00d121b579a0f375e2a4939c885722bb8758d54b26f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a2df6a66f48882ec4817a9e5c9030cd159b2f1284eaf08491182bcac617bb02",
+        "lastblockhash" : "0x197302110e88dfd58189340042255738321348f3e70735edc9557c022a1ccc79",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d7g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d7g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7510936f40ab6cadeda78c9713da716a049982f74bdbf6e07059382ffa56095f",
-                    "mixHash" : "0x3ce69f8d73a76211c1c62a2af43da3f5935137765280c5f21bde2faf5654ba24",
-                    "nonce" : "0x0543456fe0b75c67",
+                    "hash" : "0x622f27e5b5d385d9ece9e0db2b2a6be959e8e016dcb90de202ae3282186a07d1",
+                    "mixHash" : "0xf101b47981e3e98964e2c1980e8c5e9ca4fd8e28da83b52bbf772c774b39c623",
+                    "nonce" : "0x1ccee552eebd2dd2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x08b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03ce69f8d73a76211c1c62a2af43da3f5935137765280c5f21bde2faf5654ba24880543456fe0b75c67f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea008b59bf4ffe1ecc664db27d193dbc4457f5aedfd69a607028dbb9cc5e6335d4ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f101b47981e3e98964e2c1980e8c5e9ca4fd8e28da83b52bbf772c774b39c623881ccee552eebd2dd2f85ff85d800183061a8080830186a08e60016001600160011d60006000f31ba0753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ada0070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011d60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7510936f40ab6cadeda78c9713da716a049982f74bdbf6e07059382ffa56095f",
+        "lastblockhash" : "0x622f27e5b5d385d9ece9e0db2b2a6be959e8e016dcb90de202ae3282186a07d1",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0.json
index f3d48f575..a25b63be6 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d80g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2f530ac8c7021c2bb4a0817c7dcb7ed36e8fc12822ace68f4f891085c3044e38",
-                    "mixHash" : "0xe3066318e879ca8be27ca0ac6409fbe7d5e8e8a94be77db4fd6b4769a30cd7c7",
-                    "nonce" : "0xfdbafc3e2c6b7576",
+                    "hash" : "0x29e379cb264a81127b5869421c35735bd72aab3ea48697afc4dd82987f7529b2",
+                    "mixHash" : "0xbcbde34884ed1b2cb82ba94ec721ec6f60e7ff4e2c08cc76dc06112ba17856eb",
+                    "nonce" : "0x61decb297d37a289",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e3066318e879ca8be27ca0ac6409fbe7d5e8e8a94be77db4fd6b4769a30cd7c788fdbafc3e2c6b7576f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bcbde34884ed1b2cb82ba94ec721ec6f60e7ff4e2c08cc76dc06112ba17856eb8861decb297d37a289f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f530ac8c7021c2bb4a0817c7dcb7ed36e8fc12822ace68f4f891085c3044e38",
+        "lastblockhash" : "0x29e379cb264a81127b5869421c35735bd72aab3ea48697afc4dd82987f7529b2",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d80g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x00a791e19189a0a3e6d1804d6576b2b1972493e6804cbb079d263f9c2302dbf8",
-                    "mixHash" : "0x063665e63f502e3d7d9d52aaf45d14c89fc0b9599eb39c98ba561f5ef57c0279",
-                    "nonce" : "0xdc297df003c40dac",
+                    "hash" : "0x2260a8000b363df89abf9d91f7bdde4434badaafd3f749485cc439ac60534451",
+                    "mixHash" : "0x352c99f6fc084874f56d91c500204179fc4613ed959eed91de57321dc348e23d",
+                    "nonce" : "0xd86424bf6eb5103b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0063665e63f502e3d7d9d52aaf45d14c89fc0b9599eb39c98ba561f5ef57c027988dc297df003c40dacf85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0352c99f6fc084874f56d91c500204179fc4613ed959eed91de57321dc348e23d88d86424bf6eb5103bf85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00a791e19189a0a3e6d1804d6576b2b1972493e6804cbb079d263f9c2302dbf8",
+        "lastblockhash" : "0x2260a8000b363df89abf9d91f7bdde4434badaafd3f749485cc439ac60534451",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d80g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6084f5fbd880c0e2e967a70c5c29a52fba756346e533407e71b3c3076c21cf0d",
-                    "mixHash" : "0xfca906de96816f3f79aebb2c125959199fb996776f6b0fe7896aee992f8aadc7",
-                    "nonce" : "0x8f51c82ce412350c",
+                    "hash" : "0xeb5c427029376b3fa6222e1ce8bd94daef679e429f102f6d4b84fc83ed79b66c",
+                    "mixHash" : "0xc5b421b4425811d3bc4c8cb56fa5638886c5cc670e84b77d71d4c0e58544e5ff",
+                    "nonce" : "0x43cfcef4d7b4523f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fca906de96816f3f79aebb2c125959199fb996776f6b0fe7896aee992f8aadc7888f51c82ce412350cf85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c5b421b4425811d3bc4c8cb56fa5638886c5cc670e84b77d71d4c0e58544e5ff8843cfcef4d7b4523ff85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6084f5fbd880c0e2e967a70c5c29a52fba756346e533407e71b3c3076c21cf0d",
+        "lastblockhash" : "0xeb5c427029376b3fa6222e1ce8bd94daef679e429f102f6d4b84fc83ed79b66c",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d80g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3bddac1dfdaa4a342d57682d4a834bdac0021a7856e4ec10cef9841a9f6f0d96",
-                    "mixHash" : "0x147e306796a5a4923cafcd51af0d77397b8db541ce7bab75041fd9b750a3d8a7",
-                    "nonce" : "0x6af09ea5d8b8e52c",
+                    "hash" : "0xb01724967ea56e8bb26b176e5d029cd42a6134bebf35d2dc18c80a7ba5804beb",
+                    "mixHash" : "0x697098fc17618d9f0cf8a95f0cad1ca089600e76b9f365115e5e08ff0bcd4b52",
+                    "nonce" : "0x16bd96ed53132e08",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0147e306796a5a4923cafcd51af0d77397b8db541ce7bab75041fd9b750a3d8a7886af09ea5d8b8e52cf85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0697098fc17618d9f0cf8a95f0cad1ca089600e76b9f365115e5e08ff0bcd4b528816bd96ed53132e08f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bddac1dfdaa4a342d57682d4a834bdac0021a7856e4ec10cef9841a9f6f0d96",
+        "lastblockhash" : "0xb01724967ea56e8bb26b176e5d029cd42a6134bebf35d2dc18c80a7ba5804beb",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d80g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x823556316d5b945fffc1574b38872808cf7ad329f31bf21d370581bfd0c258ed",
-                    "mixHash" : "0xc6af0077f61bcf07b8e494548d7081c9971df4846a9d0648ed1ba7597b01bc9e",
-                    "nonce" : "0xdcbc0f32cefc6338",
+                    "hash" : "0xc14a00bd9c8ca83f64f675ca286be351042ba665bf6f4734b983bfa703d62612",
+                    "mixHash" : "0x1f1f0e266d10187864c6813df7b03876f4b6658624f231807c22927a82169947",
+                    "nonce" : "0x1265d21f37a7a652",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c6af0077f61bcf07b8e494548d7081c9971df4846a9d0648ed1ba7597b01bc9e88dcbc0f32cefc6338f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01f1f0e266d10187864c6813df7b03876f4b6658624f231807c22927a82169947881265d21f37a7a652f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x823556316d5b945fffc1574b38872808cf7ad329f31bf21d370581bfd0c258ed",
+        "lastblockhash" : "0xc14a00bd9c8ca83f64f675ca286be351042ba665bf6f4734b983bfa703d62612",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d80g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d80g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfb7590a34dcbbaf7165128ba870e0721e903d0fc9b7bfa93c62ae6f226caca4e",
-                    "mixHash" : "0x00bc1d4633b817da0af8c9bd0482d49264df7d496057054f39948d30ad03748a",
-                    "nonce" : "0xc2d2b34e3d018b75",
+                    "hash" : "0xda8f1dc6dbd32bdbe55b2942c1fc0d9d4a69c621ae17ed900d9c18b1496842c5",
+                    "mixHash" : "0x39f3f105b98bcbd5ff59a6c3c69524cd59bf4c730bf4799ec0610fe756a57a96",
+                    "nonce" : "0xaa01ab656387ae0d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a000bc1d4633b817da0af8c9bd0482d49264df7d496057054f39948d30ad03748a88c2d2b34e3d018b75f85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b0899b31f2245872b0bbaf71f8cba8dfe9e18c5bb2c5aa7af5a28944ad1b99e5a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a039f3f105b98bcbd5ff59a6c3c69524cd59bf4c730bf4799ec0610fe756a57a9688aa01ab656387ae0df85ff85d800183061a8080830186a08e6001600160016001cd60006000f31ba0ed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84a0283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cd60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb7590a34dcbbaf7165128ba870e0721e903d0fc9b7bfa93c62ae6f226caca4e",
+        "lastblockhash" : "0xda8f1dc6dbd32bdbe55b2942c1fc0d9d4a69c621ae17ed900d9c18b1496842c5",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0.json
index 568a9093f..2b8106d80 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d81g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0b812cd19517ac05fbe7ae0a9bfefcd890d1d1421adbe4081406f8c1f34ff1d5",
-                    "mixHash" : "0xf66c7e51270d75bb9c874c939f7cc23ea8fbd902b256165468cb84847bd8bac0",
-                    "nonce" : "0x2f7bdd84389952d9",
+                    "hash" : "0x715e051b2f1d00057c33a71055813a3e180aad21018ba16d8282e70db9801166",
+                    "mixHash" : "0xc8e2685113729e48a5d5d42720c15a4484b0a7c11cc68dfb14756e266bceb7e0",
+                    "nonce" : "0xc1ba1cecd4f33eb5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f66c7e51270d75bb9c874c939f7cc23ea8fbd902b256165468cb84847bd8bac0882f7bdd84389952d9f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c8e2685113729e48a5d5d42720c15a4484b0a7c11cc68dfb14756e266bceb7e088c1ba1cecd4f33eb5f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b812cd19517ac05fbe7ae0a9bfefcd890d1d1421adbe4081406f8c1f34ff1d5",
+        "lastblockhash" : "0x715e051b2f1d00057c33a71055813a3e180aad21018ba16d8282e70db9801166",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d81g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbee7a812d7a62db4ec132e52d94f1fcec1795f838dbf21841bca80920b1937d9",
-                    "mixHash" : "0x4c8e79dd6213800d618c517d0cf148dddb51550045a15627c5d3a230badbc1fc",
-                    "nonce" : "0xbe47668b99d2d517",
+                    "hash" : "0x388761dda266357b000260859e896d9fb5e08164d5a39118316a29ba9945335f",
+                    "mixHash" : "0x6b9650d3c356b0ef71f56d383966c9b9cacf407aadab0951157ad0b8f99af25f",
+                    "nonce" : "0x7b83c5d6dfe0b671",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04c8e79dd6213800d618c517d0cf148dddb51550045a15627c5d3a230badbc1fc88be47668b99d2d517f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06b9650d3c356b0ef71f56d383966c9b9cacf407aadab0951157ad0b8f99af25f887b83c5d6dfe0b671f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbee7a812d7a62db4ec132e52d94f1fcec1795f838dbf21841bca80920b1937d9",
+        "lastblockhash" : "0x388761dda266357b000260859e896d9fb5e08164d5a39118316a29ba9945335f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d81g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4cb7e8451788edbbd8c1af729627500b0770f029d944ad2c3e80a12205f18805",
-                    "mixHash" : "0xdef9e2fa4f64a990642284f09b154ffc4bc9e84c3ea6ab5586801b26abe3c5d5",
-                    "nonce" : "0x6dedae7c0af3ef46",
+                    "hash" : "0xde5d1e94e7ac9e8b19b7e4262dd088bc26ac71ea6619ee0d8a3d9a3f897e0772",
+                    "mixHash" : "0xa75e9366ac7d4eb998447744b9f4a6d1ec85bf4162ab785f643e9b074e1cb0b7",
+                    "nonce" : "0x7a5d407f97635b8b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0def9e2fa4f64a990642284f09b154ffc4bc9e84c3ea6ab5586801b26abe3c5d5886dedae7c0af3ef46f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a75e9366ac7d4eb998447744b9f4a6d1ec85bf4162ab785f643e9b074e1cb0b7887a5d407f97635b8bf85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cb7e8451788edbbd8c1af729627500b0770f029d944ad2c3e80a12205f18805",
+        "lastblockhash" : "0xde5d1e94e7ac9e8b19b7e4262dd088bc26ac71ea6619ee0d8a3d9a3f897e0772",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d81g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x97d5b07a4d52befda332248897aa43ab65e4e6c19adfb88dcef78942fe442376",
-                    "mixHash" : "0xa781b9d08212c6f97dd7857647ab0eb5d50389476f7ea2b5b888a128f5470ce9",
-                    "nonce" : "0x44762c7d3ca8fff7",
+                    "hash" : "0x95f6e9dc860362ce881a2091302bab836fc10953c38fb6bc44ae2b8723c6afbc",
+                    "mixHash" : "0xb686ac03cf059c096a6d6a1f9fa7a91bee665d3ecf93e945b59dd88b9c73b438",
+                    "nonce" : "0xe69674ee54e9f561",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a781b9d08212c6f97dd7857647ab0eb5d50389476f7ea2b5b888a128f5470ce98844762c7d3ca8fff7f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b686ac03cf059c096a6d6a1f9fa7a91bee665d3ecf93e945b59dd88b9c73b43888e69674ee54e9f561f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97d5b07a4d52befda332248897aa43ab65e4e6c19adfb88dcef78942fe442376",
+        "lastblockhash" : "0x95f6e9dc860362ce881a2091302bab836fc10953c38fb6bc44ae2b8723c6afbc",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d81g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6de3df2d5b210c855947e09e4c526f78afc3a113db994b5e9b937332be432320",
-                    "mixHash" : "0x7022d230bf9be33350f57de71b05f116e309291a3a82f501c5c7cd06e9e90acc",
-                    "nonce" : "0xde6e060eed52bb80",
+                    "hash" : "0x3e1a8c3ff80ee98d6cf2011e50328bece493d0e37e2a7e500690fe3fb2a4f800",
+                    "mixHash" : "0x744d8773d3f92bbaaa06d573c48af05e1179c3ded1e3f42b50e88e09d86610ed",
+                    "nonce" : "0xad42137d1bcc2980",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07022d230bf9be33350f57de71b05f116e309291a3a82f501c5c7cd06e9e90acc88de6e060eed52bb80f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0744d8773d3f92bbaaa06d573c48af05e1179c3ded1e3f42b50e88e09d86610ed88ad42137d1bcc2980f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6de3df2d5b210c855947e09e4c526f78afc3a113db994b5e9b937332be432320",
+        "lastblockhash" : "0x3e1a8c3ff80ee98d6cf2011e50328bece493d0e37e2a7e500690fe3fb2a4f800",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d81g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d81g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x061bfc620efa0eef16e155f8154a60f8226e873729bdf456fce5c32a48fc6972",
-                    "mixHash" : "0x50a2e023192328fb97e49b383d0b849a42ec7ac2225129131517d2d44621a32c",
-                    "nonce" : "0xacadd63a758846c1",
+                    "hash" : "0x958a364c4882d85cfceeafe9cb276e52a063b0320a7608d645196221d7498437",
+                    "mixHash" : "0x6bd9c7598cc76084b15b6654d935ffcb5979c4411a276004f72cb5a45284f85c",
+                    "nonce" : "0x6d6af009573862b9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x40b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a050a2e023192328fb97e49b383d0b849a42ec7ac2225129131517d2d44621a32c88acadd63a758846c1f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea040b0ff06b6f455694d9a544562cf47149a0935573e325617f67cf8ab27221120a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06bd9c7598cc76084b15b6654d935ffcb5979c4411a276004f72cb5a45284f85c886d6af009573862b9f85ff85d800183061a8080830186a08e6001600160016001ce60006000f31ca0a9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65a05896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001ce60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x061bfc620efa0eef16e155f8154a60f8226e873729bdf456fce5c32a48fc6972",
+        "lastblockhash" : "0x958a364c4882d85cfceeafe9cb276e52a063b0320a7608d645196221d7498437",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0.json
index ccd1cee69..b9b4b7c2b 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d82g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0fdaba962dfd418e269f13c447aa70ad4af43846730655f04575ea9492a64c5c",
-                    "mixHash" : "0x068c8a09a61fd3de1c5581ac9af6d93f076b1434925e33274a09dd9f0abdab7d",
-                    "nonce" : "0x1b4d3f33d390425b",
+                    "hash" : "0x162df85a69f557fd4414c23e867e24f2eb7043b615e694dbb6a51d68dfe69346",
+                    "mixHash" : "0x353596cb4e0c272b12a20ac10aefae215304d9439dc47931368580bdbc44e7a1",
+                    "nonce" : "0x6ac60434c880cdae",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0068c8a09a61fd3de1c5581ac9af6d93f076b1434925e33274a09dd9f0abdab7d881b4d3f33d390425bf85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0353596cb4e0c272b12a20ac10aefae215304d9439dc47931368580bdbc44e7a1886ac60434c880cdaef85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0fdaba962dfd418e269f13c447aa70ad4af43846730655f04575ea9492a64c5c",
+        "lastblockhash" : "0x162df85a69f557fd4414c23e867e24f2eb7043b615e694dbb6a51d68dfe69346",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d82g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4ff8afa2057d31ebfdd3085aa45e3478867c26108873d22f41ce91317d652350",
-                    "mixHash" : "0x55e1afdc328d7c53ba2142118ce46749f49b7d768db6bdf043d0d7b6c1235e41",
-                    "nonce" : "0x107a5ba70c7bf8c8",
+                    "hash" : "0x6d1bfe304de4b29c5696f0f13f2119a32b727bb4abbbf54dfa96ba702c088219",
+                    "mixHash" : "0x644fd3c77567585b24424e635fc3f08465c41d28f2ee3ef760116765d902ca7e",
+                    "nonce" : "0xb077bf252b2cb677",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a055e1afdc328d7c53ba2142118ce46749f49b7d768db6bdf043d0d7b6c1235e4188107a5ba70c7bf8c8f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0644fd3c77567585b24424e635fc3f08465c41d28f2ee3ef760116765d902ca7e88b077bf252b2cb677f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ff8afa2057d31ebfdd3085aa45e3478867c26108873d22f41ce91317d652350",
+        "lastblockhash" : "0x6d1bfe304de4b29c5696f0f13f2119a32b727bb4abbbf54dfa96ba702c088219",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d82g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x38bfce786c4f3b2c56e6e68036ba0c28683937e33801bf1d484cbf649856c9f0",
-                    "mixHash" : "0xe8af0cf2a3884fc93cde89dd3fdbdf3fd59a6cee657141a343e505c9cfd664ea",
-                    "nonce" : "0x1aec5c22cfa69695",
+                    "hash" : "0x73b3527709390f3dc038a7240803e5eeb3d210911bdeb3fae40deaf0686096e4",
+                    "mixHash" : "0xd96fd1ad9d0d60eed92f0cbb15559ebfdf8e56cbb227deb9cf11529d02776f91",
+                    "nonce" : "0x40d859b7354f6d52",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e8af0cf2a3884fc93cde89dd3fdbdf3fd59a6cee657141a343e505c9cfd664ea881aec5c22cfa69695f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d96fd1ad9d0d60eed92f0cbb15559ebfdf8e56cbb227deb9cf11529d02776f918840d859b7354f6d52f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38bfce786c4f3b2c56e6e68036ba0c28683937e33801bf1d484cbf649856c9f0",
+        "lastblockhash" : "0x73b3527709390f3dc038a7240803e5eeb3d210911bdeb3fae40deaf0686096e4",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d82g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcd1c31dad8a2eebdc2a919892cbd0280e6f108d460947cd293ffab0533bff52e",
-                    "mixHash" : "0x947818fdad3f22b90fc97c71bd3bb60c09f3263904582921f0761e48bb9b2a24",
-                    "nonce" : "0x49fbc8cab44c0831",
+                    "hash" : "0xfafccdb6e667a6a48bb63d465e861cb725452b5bcea3eca17c03a513a8dead05",
+                    "mixHash" : "0x4494efdfd3045c37f4f45762f65966d51f7215dfcb1815b46ae0e3007e30ec38",
+                    "nonce" : "0xdce2ca1196efaa6b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0947818fdad3f22b90fc97c71bd3bb60c09f3263904582921f0761e48bb9b2a248849fbc8cab44c0831f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04494efdfd3045c37f4f45762f65966d51f7215dfcb1815b46ae0e3007e30ec3888dce2ca1196efaa6bf85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd1c31dad8a2eebdc2a919892cbd0280e6f108d460947cd293ffab0533bff52e",
+        "lastblockhash" : "0xfafccdb6e667a6a48bb63d465e861cb725452b5bcea3eca17c03a513a8dead05",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d82g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa4a1a58b0db69ef3f8e2e6b0039582f55b0328cd35c21ed33429696068481087",
-                    "mixHash" : "0xa1a768e7eaa7abbe27cd9dcc3b5eebbba546b29310cbe6cddb8efeaa76f75f4d",
-                    "nonce" : "0xe31a37dc98ce8d40",
+                    "hash" : "0x29866fe028294b52abf024eaa83f86d7c55da7f6ffeeaea01d4b9a6eab5dfdd8",
+                    "mixHash" : "0xd3d9762afe7e27da380c60cf988df465409c852d0a85849124660071920a03cf",
+                    "nonce" : "0x83c5bc843f7fd5d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a1a768e7eaa7abbe27cd9dcc3b5eebbba546b29310cbe6cddb8efeaa76f75f4d88e31a37dc98ce8d40f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d3d9762afe7e27da380c60cf988df465409c852d0a85849124660071920a03cf8883c5bc843f7fd5d6f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa4a1a58b0db69ef3f8e2e6b0039582f55b0328cd35c21ed33429696068481087",
+        "lastblockhash" : "0x29866fe028294b52abf024eaa83f86d7c55da7f6ffeeaea01d4b9a6eab5dfdd8",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d82g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d82g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe1308b195ca923d06c83fd97a7546e147bc931b9dc5193f300ce0711c2a3f9a6",
-                    "mixHash" : "0x8de3ec6d76ada07db3bffcd9200e86208cdb15446bd474533a57d30ab60568c9",
-                    "nonce" : "0xf14217ac46f91cf7",
+                    "hash" : "0x075f1d2ea0e37653fe5fb69b193c77a49fd61b811dfe959d50e4df0ee955f94c",
+                    "mixHash" : "0xe433d85a8376fa3ccdc7af97d554d0e9e10a0b9f00a31612eb62c4ff1686b673",
+                    "nonce" : "0xbf06c455912b8402",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08de3ec6d76ada07db3bffcd9200e86208cdb15446bd474533a57d30ab60568c988f14217ac46f91cf7f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b35f80432a3c2aefc7ddcdd4220ccbaf1f2f094fdaeb238d59d57d4d97bf2467a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e433d85a8376fa3ccdc7af97d554d0e9e10a0b9f00a31612eb62c4ff1686b67388bf06c455912b8402f85ff85d800183061a8080830186a08e6001600160016001cf60006000f31ca0441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8a02b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001cf60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1308b195ca923d06c83fd97a7546e147bc931b9dc5193f300ce0711c2a3f9a6",
+        "lastblockhash" : "0x075f1d2ea0e37653fe5fb69b193c77a49fd61b811dfe959d50e4df0ee955f94c",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0.json
index c7cdcab84..fe8b7bf4f 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d83g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x75e572ee7a16c6c39f8214956858a8b950e5dab10a614f87664dceb73cef03ea",
-                    "mixHash" : "0x10ec6e38f6eb38189ac6ef3e75f12703ba75744da82cfedadfc3233294497196",
-                    "nonce" : "0xf53ce501c7ce938b",
+                    "hash" : "0x4071017d844010ba7e6a12cbf6b029a7777d461a577193ec8986aacf1e10bb11",
+                    "mixHash" : "0x639d86e81faef8a50abba83a2e49790da3191949bdfaf63ae97fe0313458af2a",
+                    "nonce" : "0x680dfe5a3f918584",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a010ec6e38f6eb38189ac6ef3e75f12703ba75744da82cfedadfc323329449719688f53ce501c7ce938bf85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0639d86e81faef8a50abba83a2e49790da3191949bdfaf63ae97fe0313458af2a88680dfe5a3f918584f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75e572ee7a16c6c39f8214956858a8b950e5dab10a614f87664dceb73cef03ea",
+        "lastblockhash" : "0x4071017d844010ba7e6a12cbf6b029a7777d461a577193ec8986aacf1e10bb11",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d83g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfcf70be4ffedb1d4099403efc2b0f2ed09b3c95b1310b32f69baa4993a031ecc",
-                    "mixHash" : "0xb9200451ce4bd7973baf1a4c4c159245dd31f085163d644464dec918f7397dc2",
-                    "nonce" : "0x240bfcff63a62e5c",
+                    "hash" : "0xcc787889addcae4389fb4b15440c1c0aad4a52d8545eacd0d05a07cef1a907f1",
+                    "mixHash" : "0xfb05f87d48857583d6a035c5f5f55f7836f5607a3efbdc6a9a3a5df77e184ae9",
+                    "nonce" : "0xc4ab3d423f4386f7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b9200451ce4bd7973baf1a4c4c159245dd31f085163d644464dec918f7397dc288240bfcff63a62e5cf85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb05f87d48857583d6a035c5f5f55f7836f5607a3efbdc6a9a3a5df77e184ae988c4ab3d423f4386f7f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfcf70be4ffedb1d4099403efc2b0f2ed09b3c95b1310b32f69baa4993a031ecc",
+        "lastblockhash" : "0xcc787889addcae4389fb4b15440c1c0aad4a52d8545eacd0d05a07cef1a907f1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d83g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x11630d5ed3d4e01d7ff87fadddaedd918156a6db9a408a9c52523994e09b8997",
-                    "mixHash" : "0xed0a70ed759eae681d56f996716b4fc5579af3d96bce1fb2132e6b8841918841",
-                    "nonce" : "0xf746e2a042b3d8f4",
+                    "hash" : "0x67a5d46a9fcf4077183f5e502d4bf3d00330051a48ddfb44b7fb7a12987c3e3f",
+                    "mixHash" : "0x34e4a2ecd5a5252618c6fe97442d780a181013900d08b05b6b8e2d8f2ba2e546",
+                    "nonce" : "0xab26ae9a5441e9fb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ed0a70ed759eae681d56f996716b4fc5579af3d96bce1fb2132e6b884191884188f746e2a042b3d8f4f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a034e4a2ecd5a5252618c6fe97442d780a181013900d08b05b6b8e2d8f2ba2e54688ab26ae9a5441e9fbf85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11630d5ed3d4e01d7ff87fadddaedd918156a6db9a408a9c52523994e09b8997",
+        "lastblockhash" : "0x67a5d46a9fcf4077183f5e502d4bf3d00330051a48ddfb44b7fb7a12987c3e3f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d83g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbd8bf74fb31678848179e049d0e3a8ce2269fcdc0305fce976abd67ddff4bf3d",
-                    "mixHash" : "0xd8602171e176ede3fe6c979a594a1e618b3e5bfdbc1471ec315e28fe1bc6a0ef",
-                    "nonce" : "0x2814d90209891265",
+                    "hash" : "0x26c5d3c8aed619910a745f94bd8f75e42b192a19ad00e484e254468f5e9aed4f",
+                    "mixHash" : "0x267f6695887ed9e498656dbce293c02244bfeb001c33fa3596c0490e77d988e5",
+                    "nonce" : "0x2d071f43eeff9641",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d8602171e176ede3fe6c979a594a1e618b3e5bfdbc1471ec315e28fe1bc6a0ef882814d90209891265f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0267f6695887ed9e498656dbce293c02244bfeb001c33fa3596c0490e77d988e5882d071f43eeff9641f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd8bf74fb31678848179e049d0e3a8ce2269fcdc0305fce976abd67ddff4bf3d",
+        "lastblockhash" : "0x26c5d3c8aed619910a745f94bd8f75e42b192a19ad00e484e254468f5e9aed4f",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d83g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x030470657d489e4898f0b658107154574999d4203ba4b1f8b68411c5dbd8031c",
-                    "mixHash" : "0x398748fd91a02bbbffcca7e0969de194ed83c82c1d93abb96f23fe2cbbf06336",
-                    "nonce" : "0x4830e1a52961a58d",
+                    "hash" : "0x55434d298825d43e3ac4e8339fd66fd2b8dca0ab3417f2af4bf8c5b723ea5e59",
+                    "mixHash" : "0xff88d8be1815afef8e7fb6b8113a2e468ad2aabb775ad25dfb1eaebc2d3b26ff",
+                    "nonce" : "0xf7992a6a1143f868",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0398748fd91a02bbbffcca7e0969de194ed83c82c1d93abb96f23fe2cbbf06336884830e1a52961a58df85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ff88d8be1815afef8e7fb6b8113a2e468ad2aabb775ad25dfb1eaebc2d3b26ff88f7992a6a1143f868f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x030470657d489e4898f0b658107154574999d4203ba4b1f8b68411c5dbd8031c",
+        "lastblockhash" : "0x55434d298825d43e3ac4e8339fd66fd2b8dca0ab3417f2af4bf8c5b723ea5e59",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d83g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d83g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x083ca2a5c7c2f190ddd3757e26a21309fb022628b856f6865eb47c8c13245a42",
-                    "mixHash" : "0xf149b63ed41f3b2a463eb37bdf96402745f0418c0e49a13e1712471203e61acf",
-                    "nonce" : "0xad17eef6c26f1e72",
+                    "hash" : "0xb8fa0e9632d3dd6c37166fb810385363f95baff891e2b7d826d9ffe8c69ae390",
+                    "mixHash" : "0x9d2edda53dd7e55dcf0f06e92498b06a6afa1e9b177c4f2d6271b3f184f899cd",
+                    "nonce" : "0x92417c28162c33e2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x2df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f149b63ed41f3b2a463eb37bdf96402745f0418c0e49a13e1712471203e61acf88ad17eef6c26f1e72f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea02df3bcecd815e1e204e8198e26602ea80f318718f4e0e681056346d34a161d6ba054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09d2edda53dd7e55dcf0f06e92498b06a6afa1e9b177c4f2d6271b3f184f899cd8892417c28162c33e2f85ff85d800183061a8080830186a08e6001600160016001d060006000f31ca0ad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068a01316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d060006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x083ca2a5c7c2f190ddd3757e26a21309fb022628b856f6865eb47c8c13245a42",
+        "lastblockhash" : "0xb8fa0e9632d3dd6c37166fb810385363f95baff891e2b7d826d9ffe8c69ae390",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0.json
index cdfc12468..1c15ace6c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d84g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x809492fe3fc66ac64e7df9c0aeb6331c971d9bf806dd12d0520816d9c3683498",
-                    "mixHash" : "0xb42b98834ee8512248cf1e62db90ecbe38671e8a578aa68327f2d06c287e44ab",
-                    "nonce" : "0x83361170f8825e87",
+                    "hash" : "0xfcc960cb7ba7dbe84c744cce0e798b382d36c24f7e686a2607d624db1a7a0601",
+                    "mixHash" : "0xfb82b7424ed42fddcac81151568e191d341877d250dc2672fde532dd5c1534fa",
+                    "nonce" : "0xd06255b52a277b2a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b42b98834ee8512248cf1e62db90ecbe38671e8a578aa68327f2d06c287e44ab8883361170f8825e87f85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb82b7424ed42fddcac81151568e191d341877d250dc2672fde532dd5c1534fa88d06255b52a277b2af85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x809492fe3fc66ac64e7df9c0aeb6331c971d9bf806dd12d0520816d9c3683498",
+        "lastblockhash" : "0xfcc960cb7ba7dbe84c744cce0e798b382d36c24f7e686a2607d624db1a7a0601",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d84g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4cbfbdb434b1521684f2399098038bbf9a0ace714f1595b34705dd8d7ac68aee",
-                    "mixHash" : "0xc3be392e3a098e526a9f42cf2d52bba1e69431e1fd72bf271b334c0c1ea5bd07",
-                    "nonce" : "0x89eb4ad54d20d24c",
+                    "hash" : "0x38fbaa2c0390778fc6f931c6ba25da73f1f95448ead52961e651f3ca53835daf",
+                    "mixHash" : "0x2d91fb1eaaf478c8180c2bee44f8a9e86d841875090018ceeeae2be726f5c00a",
+                    "nonce" : "0xfa34cf8c756c4c4b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c3be392e3a098e526a9f42cf2d52bba1e69431e1fd72bf271b334c0c1ea5bd078889eb4ad54d20d24cf85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02d91fb1eaaf478c8180c2bee44f8a9e86d841875090018ceeeae2be726f5c00a88fa34cf8c756c4c4bf85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cbfbdb434b1521684f2399098038bbf9a0ace714f1595b34705dd8d7ac68aee",
+        "lastblockhash" : "0x38fbaa2c0390778fc6f931c6ba25da73f1f95448ead52961e651f3ca53835daf",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d84g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x17c40a0ebecf1e545d88a6064d3085c4f4cb3101cc9f6b55008af0263758ca4d",
-                    "mixHash" : "0x0e343e81dfb3b10960252a56faba76680d1146465b07e70c7f60803019d31eac",
-                    "nonce" : "0x200d7071acebfd1d",
+                    "hash" : "0x421e5a7f3fbbe74b21d5b52cbf672cf8a9f53495d65ab6c9e1ceaa9e52a0f36f",
+                    "mixHash" : "0xe3049ed0c96bcd99e741535e21b4ea2a6c77821ebe4187499450b7c576aabc12",
+                    "nonce" : "0xc9ae87b58028e544",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00e343e81dfb3b10960252a56faba76680d1146465b07e70c7f60803019d31eac88200d7071acebfd1df85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e3049ed0c96bcd99e741535e21b4ea2a6c77821ebe4187499450b7c576aabc1288c9ae87b58028e544f85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17c40a0ebecf1e545d88a6064d3085c4f4cb3101cc9f6b55008af0263758ca4d",
+        "lastblockhash" : "0x421e5a7f3fbbe74b21d5b52cbf672cf8a9f53495d65ab6c9e1ceaa9e52a0f36f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d84g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x590244d771201af6562ca5288ffaf1b6c24a469686f0f46013012623e9d953cc",
-                    "mixHash" : "0x5669f1c951ffced4a8c0a1c3a958308bcaf23ce60783f87899ca3371e3a43aea",
-                    "nonce" : "0xcd3899a7d720e2e3",
+                    "hash" : "0xa3ad784539194b5c47e7183ac3505da9974427384a8e9252a92e8935a7d4b74f",
+                    "mixHash" : "0x190889bcb3336ad8d2e6c00877475225705464350c87a61e6f11fcfe95b33594",
+                    "nonce" : "0xe2d7a649ccbe4c6f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05669f1c951ffced4a8c0a1c3a958308bcaf23ce60783f87899ca3371e3a43aea88cd3899a7d720e2e3f85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0190889bcb3336ad8d2e6c00877475225705464350c87a61e6f11fcfe95b3359488e2d7a649ccbe4c6ff85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x590244d771201af6562ca5288ffaf1b6c24a469686f0f46013012623e9d953cc",
+        "lastblockhash" : "0xa3ad784539194b5c47e7183ac3505da9974427384a8e9252a92e8935a7d4b74f",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d84g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbafb5c3851ebe5a6b7da3f5b489f3eb58525937fde622d6bf9f39a5736eabf69",
-                    "mixHash" : "0x6513e7bb361de2c6ab5d6fa6b083da02b69f5b829b8a7425e6435aae9dc0e1e2",
-                    "nonce" : "0xba5b1c33251e036d",
+                    "hash" : "0x2614627bbebfe7cc7128384c86757eb7722e8d4530f2802a261ce825e05d6257",
+                    "mixHash" : "0x18a44a780fb2331caa2367f521dc25c997ca5e08dc36f12a3b692c29a2dbd36e",
+                    "nonce" : "0xc98b0af130bbfd15",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06513e7bb361de2c6ab5d6fa6b083da02b69f5b829b8a7425e6435aae9dc0e1e288ba5b1c33251e036df85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a018a44a780fb2331caa2367f521dc25c997ca5e08dc36f12a3b692c29a2dbd36e88c98b0af130bbfd15f85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbafb5c3851ebe5a6b7da3f5b489f3eb58525937fde622d6bf9f39a5736eabf69",
+        "lastblockhash" : "0x2614627bbebfe7cc7128384c86757eb7722e8d4530f2802a261ce825e05d6257",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d84g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d84g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x97f47bbe1f45a7e16c88ed2945cbc5c85f6b4f372b251edd4d1fd567373a0b3b",
-                    "mixHash" : "0x7d50c0b7f568eff4f3d647b5a4d2f3feee155e6022bbb4f38f82be015911ca63",
-                    "nonce" : "0xf5d769d601c6cc0b",
+                    "hash" : "0x4b752f1ad13be74c954a955bf3c0c8fbe146b7f175d556a1589bdc5ca7944fb7",
+                    "mixHash" : "0xcba72d19ea90653f0f081b618bd38c074a8e1d99f85192a88ac259bc9e5ab4f1",
+                    "nonce" : "0x2c1c82630bf34985",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xb360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07d50c0b7f568eff4f3d647b5a4d2f3feee155e6022bbb4f38f82be015911ca6388f5d769d601c6cc0bf85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0b360d5f52dc0354e1b7ca5a6067ee11ba48f2068d13ebea19261854bc2c84014a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cba72d19ea90653f0f081b618bd38c074a8e1d99f85192a88ac259bc9e5ab4f1882c1c82630bf34985f85ff85d800183061a8080830186a08e6001600160016001d160006000f31ca0984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383a002c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8cc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d160006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97f47bbe1f45a7e16c88ed2945cbc5c85f6b4f372b251edd4d1fd567373a0b3b",
+        "lastblockhash" : "0x4b752f1ad13be74c954a955bf3c0c8fbe146b7f175d556a1589bdc5ca7944fb7",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0.json
index 01d672429..0fc3b89eb 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d85g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6ba94cd883653af0837200dc97a1c3705d3e7223ce002acc2c3f2d5043205f8c",
-                    "mixHash" : "0x36b29cf252e83a134e7ab0acb6e03c92a06cf29fa18f6c3270c4109cdc66e8fe",
-                    "nonce" : "0xe653d365bda5368e",
+                    "hash" : "0xab52c5fdf2c59c78a44c3293e18ad9a3e755bf2b638fccff78929b566056f904",
+                    "mixHash" : "0xc9c0043e858cdce593eb8f48bc234720c08745650448634aa3848e0abf6e78b8",
+                    "nonce" : "0x7d2c0aa2e4765f94",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a036b29cf252e83a134e7ab0acb6e03c92a06cf29fa18f6c3270c4109cdc66e8fe88e653d365bda5368ef85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c9c0043e858cdce593eb8f48bc234720c08745650448634aa3848e0abf6e78b8887d2c0aa2e4765f94f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ba94cd883653af0837200dc97a1c3705d3e7223ce002acc2c3f2d5043205f8c",
+        "lastblockhash" : "0xab52c5fdf2c59c78a44c3293e18ad9a3e755bf2b638fccff78929b566056f904",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d85g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xefe8759a42a41990f835ed5c5dd8c80164f7e275d481918e0be2288cacdeda51",
-                    "mixHash" : "0x97efb10296a222e4cb787592143d2d09d6aa16a71365b015f1fe1b7373792bce",
-                    "nonce" : "0xde5b1a4880f0b489",
+                    "hash" : "0x1463ea3014c521db3102e1d6677212bc83b25e6ad50afe271dc321c37d2cd25b",
+                    "mixHash" : "0xec36006662d1b941784ea5f0754931767cf77110645b1898f266a0ebcd800cb1",
+                    "nonce" : "0xf35fc1f84894b719",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a097efb10296a222e4cb787592143d2d09d6aa16a71365b015f1fe1b7373792bce88de5b1a4880f0b489f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ec36006662d1b941784ea5f0754931767cf77110645b1898f266a0ebcd800cb188f35fc1f84894b719f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefe8759a42a41990f835ed5c5dd8c80164f7e275d481918e0be2288cacdeda51",
+        "lastblockhash" : "0x1463ea3014c521db3102e1d6677212bc83b25e6ad50afe271dc321c37d2cd25b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d85g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf672e932fc2861169c1eca3413b6c5b44d72cc4e0f603297e282ae1d244ebc84",
-                    "mixHash" : "0x2c71c7506c7355093cb396b20c1e82cd176db5664b216fc5d711838740d1a4f7",
-                    "nonce" : "0xbd963c19816b8c65",
+                    "hash" : "0x0a1f0f9a46a725ea7e21a82f1d183de15267aab124a9e7525e68f91b65a4d733",
+                    "mixHash" : "0xfb32dd12f1b339d88eabeac41e03a2b8a24a065241b4e8b3db0f5aeb06f2a981",
+                    "nonce" : "0xab4370ae80f6d6d7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02c71c7506c7355093cb396b20c1e82cd176db5664b216fc5d711838740d1a4f788bd963c19816b8c65f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fb32dd12f1b339d88eabeac41e03a2b8a24a065241b4e8b3db0f5aeb06f2a98188ab4370ae80f6d6d7f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf672e932fc2861169c1eca3413b6c5b44d72cc4e0f603297e282ae1d244ebc84",
+        "lastblockhash" : "0x0a1f0f9a46a725ea7e21a82f1d183de15267aab124a9e7525e68f91b65a4d733",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d85g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0e4f2b1b97a57241fe49c35636da1abd071b99bc6c8aa3dc65a176b829005bda",
-                    "mixHash" : "0xa40de0e48d41edd96acab3c718157766dea46e90315ad8a404835d59e2d7bcca",
-                    "nonce" : "0xfcd69c016fdcadb5",
+                    "hash" : "0x1eeb5ad297ababc3cef7a1e75903c1a9cc1cb7e4fc62f65fd0cb4fe797d19446",
+                    "mixHash" : "0xe0f781f004794793d919f09a07276cd7a57521a25863b5327563fa76042de9af",
+                    "nonce" : "0x8fd397c1f1ca9868",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a40de0e48d41edd96acab3c718157766dea46e90315ad8a404835d59e2d7bcca88fcd69c016fdcadb5f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e0f781f004794793d919f09a07276cd7a57521a25863b5327563fa76042de9af888fd397c1f1ca9868f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e4f2b1b97a57241fe49c35636da1abd071b99bc6c8aa3dc65a176b829005bda",
+        "lastblockhash" : "0x1eeb5ad297ababc3cef7a1e75903c1a9cc1cb7e4fc62f65fd0cb4fe797d19446",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d85g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x78bcf17c9c3b1ab3c48d9dfea856ace65c4795aeb87e09fc942d0b967fd55199",
-                    "mixHash" : "0xaecbd7703467bba9cd413a35357b6a52b7209735d138d5b71d8d3a4ddeb5e7d7",
-                    "nonce" : "0x4a6750a3aede941d",
+                    "hash" : "0xeb3abe3e26d86eef45310a86c4dbb483dd6788ef1af260af6436efa20d6aa328",
+                    "mixHash" : "0x865937ca4b796ba70ab33cc18babcaebca8eaeb1da6694d1ac7c5604d4af8668",
+                    "nonce" : "0x0c21aea81fc49487",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0aecbd7703467bba9cd413a35357b6a52b7209735d138d5b71d8d3a4ddeb5e7d7884a6750a3aede941df85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0865937ca4b796ba70ab33cc18babcaebca8eaeb1da6694d1ac7c5604d4af8668880c21aea81fc49487f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78bcf17c9c3b1ab3c48d9dfea856ace65c4795aeb87e09fc942d0b967fd55199",
+        "lastblockhash" : "0xeb3abe3e26d86eef45310a86c4dbb483dd6788ef1af260af6436efa20d6aa328",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d85g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d85g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1225b6dada5855a864fdec06553dc7525ff85e7f0fc11c50f34a31372a60a055",
-                    "mixHash" : "0xbbbeaed7d073bc40490d16fd7fa2c4afe684e10779af8b9236223376d1381d1d",
-                    "nonce" : "0xa54e416f26c8d6b1",
+                    "hash" : "0xff43a5c4c25305cf4ca1f0ecddd6c80c46a3525143cff3fb8f42d3b61ad88c47",
+                    "mixHash" : "0xf6512ad9b155b51ceef00113b851bd25a3ae823a5eda81a08ef8b8552c551e55",
+                    "nonce" : "0x28a1814b26cd80a4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bbbeaed7d073bc40490d16fd7fa2c4afe684e10779af8b9236223376d1381d1d88a54e416f26c8d6b1f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05d58080eef1d3bbbfe648aa320b2913c021a48a7c73fd6c82507c6962eb43c2aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f6512ad9b155b51ceef00113b851bd25a3ae823a5eda81a08ef8b8552c551e558828a1814b26cd80a4f85ff85d800183061a8080830186a08e6001600160016001d260006000f31ba0e3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535a07b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d260006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1225b6dada5855a864fdec06553dc7525ff85e7f0fc11c50f34a31372a60a055",
+        "lastblockhash" : "0xff43a5c4c25305cf4ca1f0ecddd6c80c46a3525143cff3fb8f42d3b61ad88c47",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0.json
index a96dd7c2e..96c3d08f9 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d86g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4aa55c620d5d12c617030592acad41fe76ff47b02d5cdfb9d15022b69ffe0605",
-                    "mixHash" : "0xb4032ebdc6450d9592bfe189fcb48f3639b1b1d0c4256f98f3f03fa0db17648c",
-                    "nonce" : "0x5dfdbb2ba4428f84",
+                    "hash" : "0x9efab105565210b7ebc57fe08deb7260dc2e3c945b178c25af210cd8ae7fa3e7",
+                    "mixHash" : "0xdcd1e1729d8bd6e71accaa2088e75a00d80d00db3718d7173f3ad8e543921caf",
+                    "nonce" : "0x375b9982fecf6d3c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b4032ebdc6450d9592bfe189fcb48f3639b1b1d0c4256f98f3f03fa0db17648c885dfdbb2ba4428f84f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0dcd1e1729d8bd6e71accaa2088e75a00d80d00db3718d7173f3ad8e543921caf88375b9982fecf6d3cf85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4aa55c620d5d12c617030592acad41fe76ff47b02d5cdfb9d15022b69ffe0605",
+        "lastblockhash" : "0x9efab105565210b7ebc57fe08deb7260dc2e3c945b178c25af210cd8ae7fa3e7",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d86g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7bb88dff10e9dc41d27312bf369eecf9350d07aa443a6a346d1011687e5f5d5f",
-                    "mixHash" : "0x1bc9fbe01f73ad22410162947650433dd3ef1d0796fc8030de38612b12ac1f69",
-                    "nonce" : "0x5a6269d636e86571",
+                    "hash" : "0xfa381bd4a9173d11099802de4f3f602f9b3dcf44f865b1d8f5ef3761d5a63fad",
+                    "mixHash" : "0x0878e9b19b8ec042e188fbdd155841271c700fbaa68b6ab668099ab6cfd2e0f8",
+                    "nonce" : "0x045b3f05b157e321",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01bc9fbe01f73ad22410162947650433dd3ef1d0796fc8030de38612b12ac1f69885a6269d636e86571f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00878e9b19b8ec042e188fbdd155841271c700fbaa68b6ab668099ab6cfd2e0f888045b3f05b157e321f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bb88dff10e9dc41d27312bf369eecf9350d07aa443a6a346d1011687e5f5d5f",
+        "lastblockhash" : "0xfa381bd4a9173d11099802de4f3f602f9b3dcf44f865b1d8f5ef3761d5a63fad",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d86g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x32f60982d4a8ffafee73ed93e0c4d709430487450f699a44fa08e7908002b06f",
-                    "mixHash" : "0x989eb27e7b859f04b5e5798f10e23c8433612b0091b6c03d8e72d0a231e641fb",
-                    "nonce" : "0xe8a163b40d1b2893",
+                    "hash" : "0xcb7188198ffe3607e9fa2e5628d5ffe2515a7b5833bd603011dbcc1716ab492b",
+                    "mixHash" : "0x4852674122c5e7847e35c36c0110cbd29101c70ca52d455d127d96eb5781fbcf",
+                    "nonce" : "0x1dd37b4a51d1e155",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0989eb27e7b859f04b5e5798f10e23c8433612b0091b6c03d8e72d0a231e641fb88e8a163b40d1b2893f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04852674122c5e7847e35c36c0110cbd29101c70ca52d455d127d96eb5781fbcf881dd37b4a51d1e155f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32f60982d4a8ffafee73ed93e0c4d709430487450f699a44fa08e7908002b06f",
+        "lastblockhash" : "0xcb7188198ffe3607e9fa2e5628d5ffe2515a7b5833bd603011dbcc1716ab492b",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d86g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1db46c4edf87be0675d2c2a99d3caae5522c396592fe8bbcc8a1d5b14a87ef50",
-                    "mixHash" : "0x09b6f4023b4a10c7f77f97f16b9a857846aab0013059c822155e46d50085fb14",
-                    "nonce" : "0xddaf5dd28501f303",
+                    "hash" : "0xe1736233484c4eab4caa99eea856c65d10f382c1a75abaa7880b03ea661b60ef",
+                    "mixHash" : "0x4bd0f79a7f4b2b3006036e600e0df788c49acf37e5135a2ca3bceaa12ec9aa47",
+                    "nonce" : "0x85e1b4874b8f6764",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a009b6f4023b4a10c7f77f97f16b9a857846aab0013059c822155e46d50085fb1488ddaf5dd28501f303f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04bd0f79a7f4b2b3006036e600e0df788c49acf37e5135a2ca3bceaa12ec9aa478885e1b4874b8f6764f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1db46c4edf87be0675d2c2a99d3caae5522c396592fe8bbcc8a1d5b14a87ef50",
+        "lastblockhash" : "0xe1736233484c4eab4caa99eea856c65d10f382c1a75abaa7880b03ea661b60ef",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d86g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x29aa75d47764b1c6259582c824a4bcb8e4ce5f229a379ba3f1f05823ef3be447",
-                    "mixHash" : "0x727d6df758333bda2171e7fc60db8a313b830410a5fd554b2d354ab30974ca84",
-                    "nonce" : "0xe289d23bfba0e6d5",
+                    "hash" : "0xe4c0f285b281ae0676624d7c3ae440534959c44a3347e16d1f7e2db1e73ca3a0",
+                    "mixHash" : "0x4213e598377f8a565a247f26ca2b49357c1da04e125994b9197f6e2e7bf74dd2",
+                    "nonce" : "0x5bddd2866e2024a9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0727d6df758333bda2171e7fc60db8a313b830410a5fd554b2d354ab30974ca8488e289d23bfba0e6d5f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04213e598377f8a565a247f26ca2b49357c1da04e125994b9197f6e2e7bf74dd2885bddd2866e2024a9f85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29aa75d47764b1c6259582c824a4bcb8e4ce5f229a379ba3f1f05823ef3be447",
+        "lastblockhash" : "0xe4c0f285b281ae0676624d7c3ae440534959c44a3347e16d1f7e2db1e73ca3a0",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d86g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d86g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc6e9125d92599cb0e3d805a6497964aa00a85b21c39fbb26644330343319f313",
-                    "mixHash" : "0x079bb1c7a8b6ff6b742ff4f3aa2b93c918f7d1617845818315134fc401ec2636",
-                    "nonce" : "0x6cc8f53fe69683cf",
+                    "hash" : "0x9f627fac7cd849618010f0c7b61b8a24329148fbb6756df1ad2053c4000845f6",
+                    "mixHash" : "0x8dfefd3b28c14eb64a8ac479c6b40c4caecb6739c952bd76e7315f9de208c782",
+                    "nonce" : "0xed961970c86a272d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xd92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0079bb1c7a8b6ff6b742ff4f3aa2b93c918f7d1617845818315134fc401ec2636886cc8f53fe69683cff85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0d92f5dbfd4ffee16e289c62d4d08916b7160ae2e399935fda4e616d6ea38b48da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08dfefd3b28c14eb64a8ac479c6b40c4caecb6739c952bd76e7315f9de208c78288ed961970c86a272df85ff85d800183061a8080830186a08e6001600160016001d360006000f31ba01b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99a027695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d360006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6e9125d92599cb0e3d805a6497964aa00a85b21c39fbb26644330343319f313",
+        "lastblockhash" : "0x9f627fac7cd849618010f0c7b61b8a24329148fbb6756df1ad2053c4000845f6",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0.json
index 88e005b5d..e1187fa36 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d87g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4b82b4779913902175e93b96fb9c02360b61275890e1fff6034c8a265e752983",
-                    "mixHash" : "0xb85623fa5583bf3f91fbe08b285d2701f4ea72108678f1e1d380f51686c0a773",
-                    "nonce" : "0xe2ccd8ff236c13b7",
+                    "hash" : "0x59a733a744a1542d24d2c27f59b7388ee94dcd1bb57970a2f94ce6b627a220e6",
+                    "mixHash" : "0x19b6c9dd9a2670865bda087db0eff21b1c849404e77e00accc0e3a758fa29007",
+                    "nonce" : "0x03d269ea08f89348",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b85623fa5583bf3f91fbe08b285d2701f4ea72108678f1e1d380f51686c0a77388e2ccd8ff236c13b7f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a019b6c9dd9a2670865bda087db0eff21b1c849404e77e00accc0e3a758fa290078803d269ea08f89348f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b82b4779913902175e93b96fb9c02360b61275890e1fff6034c8a265e752983",
+        "lastblockhash" : "0x59a733a744a1542d24d2c27f59b7388ee94dcd1bb57970a2f94ce6b627a220e6",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d87g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xedf7dba9aad63aa6458dc652f67ad9958a9efa45befd941a2075c197b7725435",
-                    "mixHash" : "0x0fb6d6b6ee2597fb79481359a6278d7a1fdeb9f9dd493084894e8ff8da3c48cb",
-                    "nonce" : "0xadc2383bb52d281c",
+                    "hash" : "0x80f1183707d4b2ae7337a8c6f599edf99831df7ab55d1e804d91aa7d2a767d29",
+                    "mixHash" : "0x897ebc9b2d496fd3d58e06f0962739306fdfb291e7c7502212f42be142d7c228",
+                    "nonce" : "0xdab3bc14ea7c5162",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00fb6d6b6ee2597fb79481359a6278d7a1fdeb9f9dd493084894e8ff8da3c48cb88adc2383bb52d281cf85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0897ebc9b2d496fd3d58e06f0962739306fdfb291e7c7502212f42be142d7c22888dab3bc14ea7c5162f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedf7dba9aad63aa6458dc652f67ad9958a9efa45befd941a2075c197b7725435",
+        "lastblockhash" : "0x80f1183707d4b2ae7337a8c6f599edf99831df7ab55d1e804d91aa7d2a767d29",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d87g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf087b462c4b128cf018012340f59f8f2edc01980520833c6e391c48d2b762180",
-                    "mixHash" : "0xc41aecca83fb8f13745054d7b5a83c62b2b8b9d6301322b786005417fffa4ba4",
-                    "nonce" : "0x666d71cb1c17b749",
+                    "hash" : "0x42f75624f58a0b23f0827bc5c8799453a260ce46026b9667d14fd1d7b5fffb88",
+                    "mixHash" : "0xcab98f41709efa89585accca15fc13cbc1efaea730c45b5e312b8c46b020b936",
+                    "nonce" : "0x9c32edd46523a1e6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c41aecca83fb8f13745054d7b5a83c62b2b8b9d6301322b786005417fffa4ba488666d71cb1c17b749f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cab98f41709efa89585accca15fc13cbc1efaea730c45b5e312b8c46b020b936889c32edd46523a1e6f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf087b462c4b128cf018012340f59f8f2edc01980520833c6e391c48d2b762180",
+        "lastblockhash" : "0x42f75624f58a0b23f0827bc5c8799453a260ce46026b9667d14fd1d7b5fffb88",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d87g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe26d400a0c82fe7895de5dcad3fca4c3ad8b8d2a56f43a31a3b07fbaa54c7dcc",
-                    "mixHash" : "0xd7149f67dc53ee60309b60a16bd9da8ea1c490ce7174abca856cf5acb1dd7841",
-                    "nonce" : "0x8ec69df1758de9a2",
+                    "hash" : "0x9995d023a6bde7f66d677a9a0d0dfe0ad3037ef0818c0b49e38274704f4fab52",
+                    "mixHash" : "0x08c09339714ccbb007aab648f300b817839da0715429b6279fea1126e9b77f9d",
+                    "nonce" : "0x4d4ba6dc4154851c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d7149f67dc53ee60309b60a16bd9da8ea1c490ce7174abca856cf5acb1dd7841888ec69df1758de9a2f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a008c09339714ccbb007aab648f300b817839da0715429b6279fea1126e9b77f9d884d4ba6dc4154851cf85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26d400a0c82fe7895de5dcad3fca4c3ad8b8d2a56f43a31a3b07fbaa54c7dcc",
+        "lastblockhash" : "0x9995d023a6bde7f66d677a9a0d0dfe0ad3037ef0818c0b49e38274704f4fab52",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d87g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc64ef96d75293def2c0086914568d940d73407c5240825c5bc1a49885244c1a5",
-                    "mixHash" : "0x4ebf804de7e29ae00841374ccb2b210f6512e574ed85ac18fc3cd7c32815c07e",
-                    "nonce" : "0x5d1fef60863c9c7b",
+                    "hash" : "0x6e07b6dca278a49c718cc7652d05be1babab04893f9b7f92526db8dcefd6224e",
+                    "mixHash" : "0x8923d883901b582534e9dff274ccb3c192d971bc67fccc54bed21f9c7a00f49f",
+                    "nonce" : "0xdd143173e0e9d901",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04ebf804de7e29ae00841374ccb2b210f6512e574ed85ac18fc3cd7c32815c07e885d1fef60863c9c7bf85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08923d883901b582534e9dff274ccb3c192d971bc67fccc54bed21f9c7a00f49f88dd143173e0e9d901f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc64ef96d75293def2c0086914568d940d73407c5240825c5bc1a49885244c1a5",
+        "lastblockhash" : "0x6e07b6dca278a49c718cc7652d05be1babab04893f9b7f92526db8dcefd6224e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d87g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d87g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb8445d446da7d32c188848b055ec1bd668228b1d38eee7f85b3c9c2121f4dde6",
-                    "mixHash" : "0xe50de0b6d3b24b9fbe5473d4a2267ee8b610536ed940c9b890b500e20cf882ab",
-                    "nonce" : "0xc84ae550d36198b6",
+                    "hash" : "0xd5fbd725307558e792d50c9cfb5d99fd677e652bc3c0d7122e437639b3f7ab09",
+                    "mixHash" : "0x1d7688a3c7dbf370c401f79537c3ebbc7074b9877fb53a28444dd2bd4ea61f6e",
+                    "nonce" : "0x7fd8804d4c994f8e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xc7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e50de0b6d3b24b9fbe5473d4a2267ee8b610536ed940c9b890b500e20cf882ab88c84ae550d36198b6f85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0c7f5acd039d4f126bb8c45103d8a9e38ec7274c94341832ef9a7414b2b081ea6a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01d7688a3c7dbf370c401f79537c3ebbc7074b9877fb53a28444dd2bd4ea61f6e887fd8804d4c994f8ef85ff85d800183061a8080830186a08e6001600160016001d460006000f31ca0314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60a0432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0ac0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d460006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8445d446da7d32c188848b055ec1bd668228b1d38eee7f85b3c9c2121f4dde6",
+        "lastblockhash" : "0xd5fbd725307558e792d50c9cfb5d99fd677e652bc3c0d7122e437639b3f7ab09",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0.json
index 564f4e23d..619416bcc 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d88g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5636222f5c06fbe01243afa842ac07cae9be8e338b5d8e8163622bb1ca2ad1ae",
-                    "mixHash" : "0x338d1f6bcc45bf99f2046b9ee16d72275975255172fd4b3b1f781e645e4f7fbb",
-                    "nonce" : "0xbc39a50006cb66b6",
+                    "hash" : "0xccaa28d83b2fca773ba5cf9187a05adeaecfa677613ccfbe950d635a551ea4d9",
+                    "mixHash" : "0x0682a2d2e02de46ac68ae9f9c378317a7bc0f93f30aaf6df2639e1122862f989",
+                    "nonce" : "0x00112cb916bc9abe",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0338d1f6bcc45bf99f2046b9ee16d72275975255172fd4b3b1f781e645e4f7fbb88bc39a50006cb66b6f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00682a2d2e02de46ac68ae9f9c378317a7bc0f93f30aaf6df2639e1122862f9898800112cb916bc9abef85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5636222f5c06fbe01243afa842ac07cae9be8e338b5d8e8163622bb1ca2ad1ae",
+        "lastblockhash" : "0xccaa28d83b2fca773ba5cf9187a05adeaecfa677613ccfbe950d635a551ea4d9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d88g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x08fcf60baca1ca8c9b8f42938af0609c074af479344b87d0fd70909a5cc66cd1",
-                    "mixHash" : "0x41f13d940804f9910147af3e8484aa00177b254be835a0b4fc4bc5ccd2c7cedd",
-                    "nonce" : "0x4e02e39c24c98148",
+                    "hash" : "0xd85debcd42b6eb133b03b9fdb3e4970455e8836ecf992de3cede2a4155641e34",
+                    "mixHash" : "0x8ec7c36180811e2a239d3a9c5a9863905907ef1611177f25477e1765ea2a0489",
+                    "nonce" : "0x173ed6139c44a304",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a041f13d940804f9910147af3e8484aa00177b254be835a0b4fc4bc5ccd2c7cedd884e02e39c24c98148f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08ec7c36180811e2a239d3a9c5a9863905907ef1611177f25477e1765ea2a048988173ed6139c44a304f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x08fcf60baca1ca8c9b8f42938af0609c074af479344b87d0fd70909a5cc66cd1",
+        "lastblockhash" : "0xd85debcd42b6eb133b03b9fdb3e4970455e8836ecf992de3cede2a4155641e34",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d88g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7a44587078fe40517bf10d10e8706c8844a0211d01f038e8979f91dba12b488a",
-                    "mixHash" : "0xc623087ddd334eefe085f291acb32a74e67ebecc43d64eee538db25c5fe35745",
-                    "nonce" : "0xb0454d18c0989b25",
+                    "hash" : "0x169debe864286c7a41ad538f4cd89e2f76cbb1ede7dc7463dfbaad028e2c113d",
+                    "mixHash" : "0x01637b7700542f24bd5e874a3472e3d8d413bae4055f62b1753956a7636a132a",
+                    "nonce" : "0x9d0ca7a612559d70",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c623087ddd334eefe085f291acb32a74e67ebecc43d64eee538db25c5fe3574588b0454d18c0989b25f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a001637b7700542f24bd5e874a3472e3d8d413bae4055f62b1753956a7636a132a889d0ca7a612559d70f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a44587078fe40517bf10d10e8706c8844a0211d01f038e8979f91dba12b488a",
+        "lastblockhash" : "0x169debe864286c7a41ad538f4cd89e2f76cbb1ede7dc7463dfbaad028e2c113d",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d88g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x464c6e40344f4fc60b7b3c604d6a1e10cf93bdae6b26b1c42609a025d62f1d85",
-                    "mixHash" : "0xfd3038d6c4a2ca2a41399108fc293a796b1f38fecba3ccea8f77bc77d22d4fab",
-                    "nonce" : "0xeff183c541912d52",
+                    "hash" : "0xb79c326f36b3d1fd3ee591bcc313d44baad47db05fc235568f98ea7eabfbaa62",
+                    "mixHash" : "0x79724b46a6de40c748febcd21c3a6f1e3d29e2611b05f95198a01cccca9a483c",
+                    "nonce" : "0xf8baa3f294eba1ca",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0fd3038d6c4a2ca2a41399108fc293a796b1f38fecba3ccea8f77bc77d22d4fab88eff183c541912d52f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a079724b46a6de40c748febcd21c3a6f1e3d29e2611b05f95198a01cccca9a483c88f8baa3f294eba1caf85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x464c6e40344f4fc60b7b3c604d6a1e10cf93bdae6b26b1c42609a025d62f1d85",
+        "lastblockhash" : "0xb79c326f36b3d1fd3ee591bcc313d44baad47db05fc235568f98ea7eabfbaa62",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d88g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf1b426cbe6f23d1867cd991449131e86cc9874b49591033a69792e2b9a6cbe19",
-                    "mixHash" : "0xf3397086e298a23e28a478121be218825dd2afb5cb65786a4628c99a78ffb21b",
-                    "nonce" : "0x396f91c7990bac4f",
+                    "hash" : "0xd95ac20872ef79594aa36f49e73cb3dc585348f6b109266fbc9058a9aed27e86",
+                    "mixHash" : "0xb44c9ed2cda8d868dd29ac6afac1710880ddcedc4dc2b5d37b46af94861f0d6a",
+                    "nonce" : "0xc0c8acc38c562240",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f3397086e298a23e28a478121be218825dd2afb5cb65786a4628c99a78ffb21b88396f91c7990bac4ff85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b44c9ed2cda8d868dd29ac6afac1710880ddcedc4dc2b5d37b46af94861f0d6a88c0c8acc38c562240f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1b426cbe6f23d1867cd991449131e86cc9874b49591033a69792e2b9a6cbe19",
+        "lastblockhash" : "0xd95ac20872ef79594aa36f49e73cb3dc585348f6b109266fbc9058a9aed27e86",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d88g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d88g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfd7c1e5910e40b62c258626e26eecc855ce07753474a0be5df99a068c4758404",
-                    "mixHash" : "0x3f195da65d871de74a5c9db621d4888898427d1adbb29c69e498721b33a4b109",
-                    "nonce" : "0x61e929c095e72000",
+                    "hash" : "0x74301f3d9fd844d560ce6745fcb1ae00d88046b1cabcc62f0ed349dd4312503a",
+                    "mixHash" : "0xcc8466767ace28b2e881abff91bd42578e9df82f8c07192d19f7a87a6fbd49ad",
+                    "nonce" : "0x3ff60622ec895822",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9da",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03f195da65d871de74a5c9db621d4888898427d1adbb29c69e498721b33a4b1098861e929c095e72000f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0ee5786219672d7dbd0472ecbefe0652b30d85015c3a2ce8da167a9647905e9daa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cc8466767ace28b2e881abff91bd42578e9df82f8c07192d19f7a87a6fbd49ad883ff60622ec895822f85ff85d800183061a8080830186a08e6001600160016001d560006000f31ca06291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195a0589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d560006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd7c1e5910e40b62c258626e26eecc855ce07753474a0be5df99a068c4758404",
+        "lastblockhash" : "0x74301f3d9fd844d560ce6745fcb1ae00d88046b1cabcc62f0ed349dd4312503a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
index 9571babb3..da55aa962 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d89g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x92db49613252b2581da846bd38701db68b73fc8763d8af48bd3ad0c453ee8ea7",
-                    "mixHash" : "0xb6bbb20e49afd3cdfb57643fb9aacd62a98def6ddabdc57dacd35a19a3bc081f",
-                    "nonce" : "0x2d529598d7cb5660",
+                    "hash" : "0x7a41cb9514eb1322188bcfce2a8d9b48c3532ec71f0b950f03a20d15fef9147a",
+                    "mixHash" : "0x286d8ead1294c5b68702d712bc496352c33a9b703c47a9d597f0da8fe46195e8",
+                    "nonce" : "0x30d4557ab0b62dd6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b6bbb20e49afd3cdfb57643fb9aacd62a98def6ddabdc57dacd35a19a3bc081f882d529598d7cb5660f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0286d8ead1294c5b68702d712bc496352c33a9b703c47a9d597f0da8fe46195e88830d4557ab0b62dd6f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92db49613252b2581da846bd38701db68b73fc8763d8af48bd3ad0c453ee8ea7",
+        "lastblockhash" : "0x7a41cb9514eb1322188bcfce2a8d9b48c3532ec71f0b950f03a20d15fef9147a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d89g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8436bc895e95b9974784b939e1ba9b0f45756cd9a5304d99539774cc170a1b3b",
-                    "mixHash" : "0xa55dbbd3d7546ba01d0c1c5b99be3624e1783eace9e42222cf0bc06c6f80a43f",
-                    "nonce" : "0x21ab6346ae37fb5a",
+                    "hash" : "0x390855395f7d03e8112288d28568c8cb6b96138bfa59de065b6dd5a9c58b511b",
+                    "mixHash" : "0xe30968f39d1c5a6cb7a9da124602c3eae1d665494547e105b20753173bb74f94",
+                    "nonce" : "0x9003f2299a4ec419",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a55dbbd3d7546ba01d0c1c5b99be3624e1783eace9e42222cf0bc06c6f80a43f8821ab6346ae37fb5af85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e30968f39d1c5a6cb7a9da124602c3eae1d665494547e105b20753173bb74f94889003f2299a4ec419f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8436bc895e95b9974784b939e1ba9b0f45756cd9a5304d99539774cc170a1b3b",
+        "lastblockhash" : "0x390855395f7d03e8112288d28568c8cb6b96138bfa59de065b6dd5a9c58b511b",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d89g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2e8f3b2d2d6061a953602667b05defcdf99fc9d69ae221b3fcae9cdd3cd66ca6",
-                    "mixHash" : "0x7795c8d38653c8e9d19869c7618f47bb1b860bb7ae0a7cc44a9a8461f254baa3",
-                    "nonce" : "0xd850a688ee903759",
+                    "hash" : "0x2495d9147f422801dfcc7e3879c0c07bf7b56bcbc3e15f7b6f7b8d8f7f552e55",
+                    "mixHash" : "0xbefb6352882cabf1c2b4b95de08f3fcbbe4f9b2a5156d6ed39c0701c1cf87b55",
+                    "nonce" : "0x5c2cb842cba9692e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07795c8d38653c8e9d19869c7618f47bb1b860bb7ae0a7cc44a9a8461f254baa388d850a688ee903759f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0befb6352882cabf1c2b4b95de08f3fcbbe4f9b2a5156d6ed39c0701c1cf87b55885c2cb842cba9692ef85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e8f3b2d2d6061a953602667b05defcdf99fc9d69ae221b3fcae9cdd3cd66ca6",
+        "lastblockhash" : "0x2495d9147f422801dfcc7e3879c0c07bf7b56bcbc3e15f7b6f7b8d8f7f552e55",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d89g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x575822a52ce95ce87ed579ee512885fb3e71d6c9219857c51e11161b10a74d0b",
-                    "mixHash" : "0x4414a7cb7b3d1fd13471bcf526208bd2e535edcfa726d85be72f71af1999b294",
-                    "nonce" : "0xa67e1861093c35d9",
+                    "hash" : "0x9813d662a653000171d24af8d5d913dfde3d0aa0071f7a115f4df2100146307d",
+                    "mixHash" : "0x13f43ba53bc402e9a8c33ee065235aec335212cd11e43618881234da8d4e9aea",
+                    "nonce" : "0x98e963e02f17b7eb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04414a7cb7b3d1fd13471bcf526208bd2e535edcfa726d85be72f71af1999b29488a67e1861093c35d9f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a013f43ba53bc402e9a8c33ee065235aec335212cd11e43618881234da8d4e9aea8898e963e02f17b7ebf85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x575822a52ce95ce87ed579ee512885fb3e71d6c9219857c51e11161b10a74d0b",
+        "lastblockhash" : "0x9813d662a653000171d24af8d5d913dfde3d0aa0071f7a115f4df2100146307d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d89g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7776f7181b23a7ccbf3986b68653bf696880ec110b063bae5a5cbc0e6eb154ac",
-                    "mixHash" : "0x1e3d6bc39c8d5f95af3b9f289550ae0b6827c7d58ba9cb28017349f31a879813",
-                    "nonce" : "0xbe2131fcff9d9714",
+                    "hash" : "0xdc9e815a234ea32f4b87891f2170e144a697f8d91f09088ce8a8bb9a0b1ef247",
+                    "mixHash" : "0xd0aa7feafa3037e087f46bc27e4a1aab51731661debb2429bae6e02624490b57",
+                    "nonce" : "0x7cb18aa6c3fd82cb",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01e3d6bc39c8d5f95af3b9f289550ae0b6827c7d58ba9cb28017349f31a87981388be2131fcff9d9714f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d0aa7feafa3037e087f46bc27e4a1aab51731661debb2429bae6e02624490b57887cb18aa6c3fd82cbf85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7776f7181b23a7ccbf3986b68653bf696880ec110b063bae5a5cbc0e6eb154ac",
+        "lastblockhash" : "0xdc9e815a234ea32f4b87891f2170e144a697f8d91f09088ce8a8bb9a0b1ef247",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d89g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d89g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x483cd853a2b827b1e188a1286aa5bc8a1433497208870b78c8c0869a0c292518",
-                    "mixHash" : "0x57a46a6c9b5fda43733a3b40148fff320387347eef50e7432edaf71628b2582e",
-                    "nonce" : "0x672e37bf6be1fdf9",
+                    "hash" : "0x861ace31baee2c7f7ff9145e7ff3390a3a65e7b4ac39522b63d05e2d8334a0ed",
+                    "mixHash" : "0x9eec6a2b5137c48357e7dd3c40de839d42c4ece4c0776c5441150c93e9857272",
+                    "nonce" : "0xe28551811e60ea26",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xbc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057a46a6c9b5fda43733a3b40148fff320387347eef50e7432edaf71628b2582e88672e37bf6be1fdf9f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0bc176088cb3f2bd5d70dc333be86ae3749795ff670e586deb944509b5cc5625ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09eec6a2b5137c48357e7dd3c40de839d42c4ece4c0776c5441150c93e985727288e28551811e60ea26f85ff85d800183061a8080830186a08e6001600160016001d660006000f31ca0b569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10a069a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabefc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d660006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x483cd853a2b827b1e188a1286aa5bc8a1433497208870b78c8c0869a0c292518",
+        "lastblockhash" : "0x861ace31baee2c7f7ff9145e7ff3390a3a65e7b4ac39522b63d05e2d8334a0ed",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0.json
index 8455ff85e..36ecd3007 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d8g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1b1f8017f6dcb8c80add66582cb047b560272df005935b9e1884b98e6095cdb7",
-                    "mixHash" : "0xc00f2b5f32f7c63aeba1bfd1d4b280a77c926d3d8652fade2c7245e4267ed109",
-                    "nonce" : "0x0ce61a3adc33a15a",
+                    "hash" : "0x138b0eb5e098df1385def007cc145a079441534489e29d010efb1f03ea7d4bb4",
+                    "mixHash" : "0xd4697c0d709f8ef2a54c87a0e2420dc831e40eddf136036e28a16278c4d79d74",
+                    "nonce" : "0xcd4bfb9883fd79b7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c00f2b5f32f7c63aeba1bfd1d4b280a77c926d3d8652fade2c7245e4267ed109880ce61a3adc33a15af85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d4697c0d709f8ef2a54c87a0e2420dc831e40eddf136036e28a16278c4d79d7488cd4bfb9883fd79b7f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b1f8017f6dcb8c80add66582cb047b560272df005935b9e1884b98e6095cdb7",
+        "lastblockhash" : "0x138b0eb5e098df1385def007cc145a079441534489e29d010efb1f03ea7d4bb4",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d8g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe4df6e4339f7a45e693cb7d7b1c98f878688360fc929252ac0eb6d4c7be63b38",
-                    "mixHash" : "0x15afc598b36f6ba2c64b7055c0442cf5b88895046fc5a02c5d80a13e3fc9b41c",
-                    "nonce" : "0x52aa113bb7118ad0",
+                    "hash" : "0x964821ec87fa620d1d689d86758e50448fe5f8f3488997843ae71215112d91ef",
+                    "mixHash" : "0x0d2eac053a9316af3a6b0eb3b709ff97268a652dd4dde26670caab0319c440c9",
+                    "nonce" : "0x9620e51fdaee6abc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a015afc598b36f6ba2c64b7055c0442cf5b88895046fc5a02c5d80a13e3fc9b41c8852aa113bb7118ad0f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d2eac053a9316af3a6b0eb3b709ff97268a652dd4dde26670caab0319c440c9889620e51fdaee6abcf85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4df6e4339f7a45e693cb7d7b1c98f878688360fc929252ac0eb6d4c7be63b38",
+        "lastblockhash" : "0x964821ec87fa620d1d689d86758e50448fe5f8f3488997843ae71215112d91ef",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d8g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x030846386b8343e8c6acbb4d318a5492e7cf268415a22f53a86e0481f351b15c",
-                    "mixHash" : "0x1c01c46ed33af391325888a9e7697b7c9bf6716590d02ae69e6b12a7a6f72112",
-                    "nonce" : "0x24e6d30d9a2b7536",
+                    "hash" : "0x00bd836d0f3c213a2fe18d8461f7e62a378aa75491a3750b42ab7b3a3bde9297",
+                    "mixHash" : "0x409096a428b003acbffa8d5f1ac15351800e0b9745b4b9cc0ae26fb4b5a2011d",
+                    "nonce" : "0xb6f5b7ad18f1f84e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01c01c46ed33af391325888a9e7697b7c9bf6716590d02ae69e6b12a7a6f721128824e6d30d9a2b7536f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0409096a428b003acbffa8d5f1ac15351800e0b9745b4b9cc0ae26fb4b5a2011d88b6f5b7ad18f1f84ef85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x030846386b8343e8c6acbb4d318a5492e7cf268415a22f53a86e0481f351b15c",
+        "lastblockhash" : "0x00bd836d0f3c213a2fe18d8461f7e62a378aa75491a3750b42ab7b3a3bde9297",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d8g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe07fa4a23b652f1fe58fe385e90c70e3e8cf7072450adf1926be9a0b0f2b5204",
-                    "mixHash" : "0xb9370e72d7c36a86924bea13426bd5c7fa2bf226fd3c4d6af0bc771487325e65",
-                    "nonce" : "0x10c9fe86fec16b93",
+                    "hash" : "0x783b115cf1217495a024c2f55e9a06c23809b5e468a65500565eec7d024f7db7",
+                    "mixHash" : "0x42571eeef8f68eeb573ad7427462f55e7ebd778a3f0295a5396714da7bd19ce9",
+                    "nonce" : "0x7fa303fe1e4dce86",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b9370e72d7c36a86924bea13426bd5c7fa2bf226fd3c4d6af0bc771487325e658810c9fe86fec16b93f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a042571eeef8f68eeb573ad7427462f55e7ebd778a3f0295a5396714da7bd19ce9887fa303fe1e4dce86f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe07fa4a23b652f1fe58fe385e90c70e3e8cf7072450adf1926be9a0b0f2b5204",
+        "lastblockhash" : "0x783b115cf1217495a024c2f55e9a06c23809b5e468a65500565eec7d024f7db7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d8g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcd73d81d055a88947da13937198dc51effa13844d70f2306ac959fdb609f73f7",
-                    "mixHash" : "0x316b01731f38dd79c0f0bde8150eb2eb324904b689dc50b2e9924a8e41e2145e",
-                    "nonce" : "0x0f0beb523fd91ca4",
+                    "hash" : "0x5364b9a8a188e071405e38d3725c4b096d518fa466965f393fd90d351f0cfa2f",
+                    "mixHash" : "0x34dea1ad02b4fc92e6012035af97daebae2b11c7062800a8f956aa2b7c61724b",
+                    "nonce" : "0xcaff3cddd0d54028",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0316b01731f38dd79c0f0bde8150eb2eb324904b689dc50b2e9924a8e41e2145e880f0beb523fd91ca4f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a034dea1ad02b4fc92e6012035af97daebae2b11c7062800a8f956aa2b7c61724b88caff3cddd0d54028f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd73d81d055a88947da13937198dc51effa13844d70f2306ac959fdb609f73f7",
+        "lastblockhash" : "0x5364b9a8a188e071405e38d3725c4b096d518fa466965f393fd90d351f0cfa2f",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d8g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d8g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe9a9f64fa5c977ea22faac8fd74d91b29bb361edb1588a9866c1bb4a097f5d7c",
-                    "mixHash" : "0x9f5a8e621b4e32631031860846eeaacd51cc9c7480ec21985c4669e11f594e00",
-                    "nonce" : "0x778ff197a6dd4bcc",
+                    "hash" : "0x7f6e50be26b02f940fdc180038d4e25a85054b132985ca7b63bc370c90e88047",
+                    "mixHash" : "0xa418f8b2555f35f4cb122263ba1f1bdb7a9d8eca6a7f3399bdf47fa208662219",
+                    "nonce" : "0xb573c8324de6abe1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x12ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09f5a8e621b4e32631031860846eeaacd51cc9c7480ec21985c4669e11f594e0088778ff197a6dd4bccf85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea012ad613636e5254744309f2f731d0eddba98be79a6bff0164a2a0cfd0f9cc150a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a418f8b2555f35f4cb122263ba1f1bdb7a9d8eca6a7f3399bdf47fa20866221988b573c8324de6abe1f85ff85d800183061a8080830186a08e60016001600160011e60006000f31ca0b121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188a067b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011e60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9a9f64fa5c977ea22faac8fd74d91b29bb361edb1588a9866c1bb4a097f5d7c",
+        "lastblockhash" : "0x7f6e50be26b02f940fdc180038d4e25a85054b132985ca7b63bc370c90e88047",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0.json
index e26b7c1e6..42000f46d 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d90g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x826e2061719079c74dc95fb107b61d698ada77cd3e7c6518626b7f16dcd05f73",
-                    "mixHash" : "0x43c82ebc57c49c3774a2159b281f229fb44d50b57d821350f5ddf95e0b3f30e4",
-                    "nonce" : "0x7d11f3deb5599625",
+                    "hash" : "0xad1c5eb0de8d6533af974a93d32d1c254f6d90423a615ec259f78234fb445eae",
+                    "mixHash" : "0x5bfc4e9d15abf58572389c4c404f00b2fa7e0ecb5adfb92f758860a4e8342e8e",
+                    "nonce" : "0x50a76b9e0fbfa2bd",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a043c82ebc57c49c3774a2159b281f229fb44d50b57d821350f5ddf95e0b3f30e4887d11f3deb5599625f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05bfc4e9d15abf58572389c4c404f00b2fa7e0ecb5adfb92f758860a4e8342e8e8850a76b9e0fbfa2bdf85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x826e2061719079c74dc95fb107b61d698ada77cd3e7c6518626b7f16dcd05f73",
+        "lastblockhash" : "0xad1c5eb0de8d6533af974a93d32d1c254f6d90423a615ec259f78234fb445eae",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d90g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2352173abfbaf5858d7f0d4d6d39f350a754e0c692e243a78571810716fc5eb4",
-                    "mixHash" : "0xbb00a505a0244f8a496f4042a43484f45c04f0e56882314303a514802528a838",
-                    "nonce" : "0x3f421e239f92ccbb",
+                    "hash" : "0x066c88163febeae5d5a2541f1be97d570cb85087b9ab37c5f05a9392cf6a0b75",
+                    "mixHash" : "0x57add018d2f17abb38ab317aae7400171ae63bc1282d6e0f201cd5a1f3c2c525",
+                    "nonce" : "0x71830249efd28cc0",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bb00a505a0244f8a496f4042a43484f45c04f0e56882314303a514802528a838883f421e239f92ccbbf85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a057add018d2f17abb38ab317aae7400171ae63bc1282d6e0f201cd5a1f3c2c5258871830249efd28cc0f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2352173abfbaf5858d7f0d4d6d39f350a754e0c692e243a78571810716fc5eb4",
+        "lastblockhash" : "0x066c88163febeae5d5a2541f1be97d570cb85087b9ab37c5f05a9392cf6a0b75",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d90g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe4edabb4d4c5c115104667735443ca7635db30c033a272872563882b5b8eb609",
-                    "mixHash" : "0x6f6237524cbfba57b73fcc5e8722eb3871432a37b049a7f3c5c51b48639c91e6",
-                    "nonce" : "0x406365b9d4e1e428",
+                    "hash" : "0x67aec92fc90d99d271270a49f96faa76e78aa1cb7301fe56b7e6d4405261d7f5",
+                    "mixHash" : "0xb15a962b3115b8bbbb11d4ebd35cdb18bf3fa93403a6b0b84dfbaff73e151627",
+                    "nonce" : "0xed08a8ee3fdd768c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06f6237524cbfba57b73fcc5e8722eb3871432a37b049a7f3c5c51b48639c91e688406365b9d4e1e428f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b15a962b3115b8bbbb11d4ebd35cdb18bf3fa93403a6b0b84dfbaff73e15162788ed08a8ee3fdd768cf85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4edabb4d4c5c115104667735443ca7635db30c033a272872563882b5b8eb609",
+        "lastblockhash" : "0x67aec92fc90d99d271270a49f96faa76e78aa1cb7301fe56b7e6d4405261d7f5",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d90g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xff8e4c545238cb7d7c0b903a521f1d91a8cf70c99659d4916cb7f8356341bf74",
-                    "mixHash" : "0x6bfec8b6a2277b4c2c94cc584c726d8fdcee1971900c8ed2a913348c3bcf2ed2",
-                    "nonce" : "0x9db3de4da8f7a301",
+                    "hash" : "0x6b27a5e5b16c8e7fbe2169410dcc9ea38b09445882944b9e58c646c3662c55ce",
+                    "mixHash" : "0xda440a6a88f32bdda948c26971afe6d912d8b049cb88894d6c8e64a3c1fef280",
+                    "nonce" : "0xeb3d5d126221006e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06bfec8b6a2277b4c2c94cc584c726d8fdcee1971900c8ed2a913348c3bcf2ed2889db3de4da8f7a301f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0da440a6a88f32bdda948c26971afe6d912d8b049cb88894d6c8e64a3c1fef28088eb3d5d126221006ef85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff8e4c545238cb7d7c0b903a521f1d91a8cf70c99659d4916cb7f8356341bf74",
+        "lastblockhash" : "0x6b27a5e5b16c8e7fbe2169410dcc9ea38b09445882944b9e58c646c3662c55ce",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d90g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb277a0202827abd0397756a9303f42b6b22de008a70992b8fb27d22ae8566b96",
-                    "mixHash" : "0x5d61bad66078d389c9c52b0a8d9e154758c635f6a687bb026f8ef4bab0e3e1d4",
-                    "nonce" : "0xa139cf93ec72df99",
+                    "hash" : "0x7c7942eee81c4034e56dae39563dddf07615e4fc5d9b5f5ee24debe23ec93724",
+                    "mixHash" : "0xcb1ea22b4ed7e82bf4ad2fbf92e24308da79251d1d2409cb59b3a61865720953",
+                    "nonce" : "0x7adbdb4e0bbc9d7d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05d61bad66078d389c9c52b0a8d9e154758c635f6a687bb026f8ef4bab0e3e1d488a139cf93ec72df99f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cb1ea22b4ed7e82bf4ad2fbf92e24308da79251d1d2409cb59b3a61865720953887adbdb4e0bbc9d7df85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb277a0202827abd0397756a9303f42b6b22de008a70992b8fb27d22ae8566b96",
+        "lastblockhash" : "0x7c7942eee81c4034e56dae39563dddf07615e4fc5d9b5f5ee24debe23ec93724",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d90g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d90g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x582e8b7c5a469700987e91a36b61c966f18b102ac1670d51f3c311549127b2b9",
-                    "mixHash" : "0xb3797c028f8dfb890c9ddc6d4f5c45e36d33993f490d501f88db4d16fa6747f8",
-                    "nonce" : "0x0a7e5515b8b21ec3",
+                    "hash" : "0xf11e555b92642c6e2f06b1ab01bda4b3ec54cdd74e9e36d029be70855509e543",
+                    "mixHash" : "0xcc65d567f7dffda5baa041078fab8f2d6dae4165a916400c3d7caa5b3d0b97fc",
+                    "nonce" : "0xfa5a258e1423c784",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x27cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b3797c028f8dfb890c9ddc6d4f5c45e36d33993f490d501f88db4d16fa6747f8880a7e5515b8b21ec3f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea027cadd5a012732daa1cac48a4351a1c308eda2f21c32ef7425eeddc6b1ae5c49a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cc65d567f7dffda5baa041078fab8f2d6dae4165a916400c3d7caa5b3d0b97fc88fa5a258e1423c784f85ff85d800183061a8080830186a08e6001600160016001d760006000f31ca0beaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397a055a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d760006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x582e8b7c5a469700987e91a36b61c966f18b102ac1670d51f3c311549127b2b9",
+        "lastblockhash" : "0xf11e555b92642c6e2f06b1ab01bda4b3ec54cdd74e9e36d029be70855509e543",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0.json
index 08007cb80..51d52aede 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d91g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x1c1283f144da9c02c38988549a1d3e04c750bf728a6595eb89164b5bde8ef8d6",
-                    "mixHash" : "0xd1705bfd0adf1e39e520c1c8132f6d6e75251667df70e39e11a6ceb0f84566a1",
-                    "nonce" : "0xc70a8298a19a8d49",
+                    "hash" : "0xd53407ba4d73da20c98da8e46e8048e2c6b758967a82411573007b5f66491627",
+                    "mixHash" : "0x52c2afc47330652e35296a8385662b6a1e30e7f7bf4a835b5654711c5165f95f",
+                    "nonce" : "0x110de5a9440cc1c2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d1705bfd0adf1e39e520c1c8132f6d6e75251667df70e39e11a6ceb0f84566a188c70a8298a19a8d49f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052c2afc47330652e35296a8385662b6a1e30e7f7bf4a835b5654711c5165f95f88110de5a9440cc1c2f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c1283f144da9c02c38988549a1d3e04c750bf728a6595eb89164b5bde8ef8d6",
+        "lastblockhash" : "0xd53407ba4d73da20c98da8e46e8048e2c6b758967a82411573007b5f66491627",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d91g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbe0a181955719bdbea777401663013c734258d08889ca1f1d0b78f6df95b4d5f",
-                    "mixHash" : "0x84790b921c739b5fca4ed66b6089298d01aeaae2411ca54723de09031038ba55",
-                    "nonce" : "0x636818b4eed1145e",
+                    "hash" : "0x0706dcbb6da50c1d6bb0d2dd0cf4c7e5aa8f196636d8d3586b8a9353b6b3f0a7",
+                    "mixHash" : "0x80a821e0da1d87699e013c869eb3a180fd6738e41005230858fefe9a11df9158",
+                    "nonce" : "0xe355cb9ace850efa",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a084790b921c739b5fca4ed66b6089298d01aeaae2411ca54723de09031038ba5588636818b4eed1145ef85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a080a821e0da1d87699e013c869eb3a180fd6738e41005230858fefe9a11df915888e355cb9ace850efaf85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe0a181955719bdbea777401663013c734258d08889ca1f1d0b78f6df95b4d5f",
+        "lastblockhash" : "0x0706dcbb6da50c1d6bb0d2dd0cf4c7e5aa8f196636d8d3586b8a9353b6b3f0a7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d91g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbf00260ac0a1230f220e27611d0402f2c4ddc37da31e964d8c10dd96f9b7f2a9",
-                    "mixHash" : "0x23536fd5667f9ae815f40df8dfd29fceec9b73c148c2a6ea5b87faffb9600647",
-                    "nonce" : "0xe075d76039bc64f2",
+                    "hash" : "0xb15bf57009f46f64fff0a2166808741c643f3caba077cad4a4c8d160f0a9f63f",
+                    "mixHash" : "0xc9cf3e696e58f41548cd2c529e53c5abe13f3ae3c6f5e41ec6c10acb6ee60733",
+                    "nonce" : "0xf60af0b77f095b15",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a023536fd5667f9ae815f40df8dfd29fceec9b73c148c2a6ea5b87faffb960064788e075d76039bc64f2f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c9cf3e696e58f41548cd2c529e53c5abe13f3ae3c6f5e41ec6c10acb6ee6073388f60af0b77f095b15f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf00260ac0a1230f220e27611d0402f2c4ddc37da31e964d8c10dd96f9b7f2a9",
+        "lastblockhash" : "0xb15bf57009f46f64fff0a2166808741c643f3caba077cad4a4c8d160f0a9f63f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d91g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x320dccb7d220342bb8e531293e522d103ec69a0a3a15f1102024aa36ade9de81",
-                    "mixHash" : "0xf92ef277f40de86c9858134ac09cab869a26bfab1e11f4bac90cfd11f4978e2b",
-                    "nonce" : "0x573d15f4eb30ba5e",
+                    "hash" : "0xb8463458c58381fb33879852465453557c1b7f2595e1f08067108870e23a4358",
+                    "mixHash" : "0x80387ffc659be66d41983e3e5c939d8aa8aad172ee37b4ef6d015e5d36448dff",
+                    "nonce" : "0x7816cbec666e17ab",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0f92ef277f40de86c9858134ac09cab869a26bfab1e11f4bac90cfd11f4978e2b88573d15f4eb30ba5ef85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a080387ffc659be66d41983e3e5c939d8aa8aad172ee37b4ef6d015e5d36448dff887816cbec666e17abf85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x320dccb7d220342bb8e531293e522d103ec69a0a3a15f1102024aa36ade9de81",
+        "lastblockhash" : "0xb8463458c58381fb33879852465453557c1b7f2595e1f08067108870e23a4358",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d91g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5142dd3bc3b5edf8bae4e302d14a01560767ccc26c7aac2764da8669cb94433b",
-                    "mixHash" : "0x8b5624e145dd1687b006c33eb228a118ab8b7ae1d6184884312893ee8c3bd383",
-                    "nonce" : "0x4247b29778dc8033",
+                    "hash" : "0x073ec75e2efed885c7ff367cc5749a2ce6cf271246723b036226375b41147066",
+                    "mixHash" : "0x091a239a10b91203e85611890c357175874fd76c37eb0c68adbc5552403a0f52",
+                    "nonce" : "0x5a9353caf3ff101a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08b5624e145dd1687b006c33eb228a118ab8b7ae1d6184884312893ee8c3bd383884247b29778dc8033f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0091a239a10b91203e85611890c357175874fd76c37eb0c68adbc5552403a0f52885a9353caf3ff101af85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5142dd3bc3b5edf8bae4e302d14a01560767ccc26c7aac2764da8669cb94433b",
+        "lastblockhash" : "0x073ec75e2efed885c7ff367cc5749a2ce6cf271246723b036226375b41147066",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d91g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d91g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd3b140f325b1d31e29ea4dc5c5189d5e3561226c893a3fc752e701847c942d9e",
-                    "mixHash" : "0x6a86d2e14c08a0d5ccd45a6b26900b3f335a15f83957025d10f5caffee14e83e",
-                    "nonce" : "0x4f50f09dd48911e9",
+                    "hash" : "0x13775706ee069201f9499d0526f7933e2d1ff5f812c550eea4fb2300a081345d",
+                    "mixHash" : "0x928a82eb139ee5bef732ffcaaf6375183190b915f62135bc3ad5bebe137d5f0e",
+                    "nonce" : "0x8add87caba678b49",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06a86d2e14c08a0d5ccd45a6b26900b3f335a15f83957025d10f5caffee14e83e884f50f09dd48911e9f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0500e6176e6540ef7b07f61e8236976fd7eabef8840de615cf0af715d799a683ea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0928a82eb139ee5bef732ffcaaf6375183190b915f62135bc3ad5bebe137d5f0e888add87caba678b49f85ff85d800183061a8080830186a08e6001600160016001d860006000f31ca0a8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8ca03d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d860006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3b140f325b1d31e29ea4dc5c5189d5e3561226c893a3fc752e701847c942d9e",
+        "lastblockhash" : "0x13775706ee069201f9499d0526f7933e2d1ff5f812c550eea4fb2300a081345d",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0.json
index 15c3b210b..6d7717ccb 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d92g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd4e5270469db849b79f52b9de1b2703fad3992b1d257f1f5f4316e4de79160b7",
-                    "mixHash" : "0xd8c5c12a8ada3de47d01346b402ec3a9fd29d6dfae6ca93adf70d79ddd7e04ad",
-                    "nonce" : "0xd18120de03ee1e37",
+                    "hash" : "0xee04b53d04b43fde1aec6659fc06874ee0b9e97ef42aa54af2dc9865c2836bd3",
+                    "mixHash" : "0x316aafe5a4d8d667cc13e0d50dbeccbf5b8e3d37eb14f4baa81512671de7de7c",
+                    "nonce" : "0xd447e9034ee5a111",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d8c5c12a8ada3de47d01346b402ec3a9fd29d6dfae6ca93adf70d79ddd7e04ad88d18120de03ee1e37f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0316aafe5a4d8d667cc13e0d50dbeccbf5b8e3d37eb14f4baa81512671de7de7c88d447e9034ee5a111f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4e5270469db849b79f52b9de1b2703fad3992b1d257f1f5f4316e4de79160b7",
+        "lastblockhash" : "0xee04b53d04b43fde1aec6659fc06874ee0b9e97ef42aa54af2dc9865c2836bd3",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d92g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x214ed98f93a8c8208a592e9ea8e6b20bb9e85ae058a464691c2be92b3e3cfbd4",
-                    "mixHash" : "0x8752576612d2c95803ba141d9a1b8592f26d592a05620e5e73e5933b69b9c923",
-                    "nonce" : "0x6a6c16e86bd48c05",
+                    "hash" : "0xf4d075a013f85ab68324ed24530f84b5e40dc8558d145da1527013f9880cb6e2",
+                    "mixHash" : "0xb28f159e086997055d878969db318e7ef115c38bdd05461ac8d19c477100a215",
+                    "nonce" : "0x230ec7139e72be81",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08752576612d2c95803ba141d9a1b8592f26d592a05620e5e73e5933b69b9c923886a6c16e86bd48c05f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b28f159e086997055d878969db318e7ef115c38bdd05461ac8d19c477100a21588230ec7139e72be81f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x214ed98f93a8c8208a592e9ea8e6b20bb9e85ae058a464691c2be92b3e3cfbd4",
+        "lastblockhash" : "0xf4d075a013f85ab68324ed24530f84b5e40dc8558d145da1527013f9880cb6e2",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d92g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf78b9d81fe184d152d141028dfda2e42a3337377acc473c7368c0ea155f120b9",
-                    "mixHash" : "0x5b399fffdabc100778a016f8d21cbc1aa316159a6fb231c2398c146d2982154c",
-                    "nonce" : "0x82cfeba2e39a7fb7",
+                    "hash" : "0x1da5d29d376d6d16a3d9a22d557ba2756c9c83a9b78b7d15463725218a749947",
+                    "mixHash" : "0x50def551728acb3b402ef7384336dbc410d2d505f0faf1d02108361e37bc7035",
+                    "nonce" : "0x107b50374fee8d47",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05b399fffdabc100778a016f8d21cbc1aa316159a6fb231c2398c146d2982154c8882cfeba2e39a7fb7f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a050def551728acb3b402ef7384336dbc410d2d505f0faf1d02108361e37bc703588107b50374fee8d47f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf78b9d81fe184d152d141028dfda2e42a3337377acc473c7368c0ea155f120b9",
+        "lastblockhash" : "0x1da5d29d376d6d16a3d9a22d557ba2756c9c83a9b78b7d15463725218a749947",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d92g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa62e86e15e30f671ab23a1d045da3261743fca885e88b01c3d90a96b51c26d79",
-                    "mixHash" : "0x6e551b86934bdeec3d752310e90d41bb5ddbd7dea1601b57cc85ae0a5feeafa6",
-                    "nonce" : "0xee02e3709fa3582f",
+                    "hash" : "0xcf644e10f5b44d79cf77fe8d9e1f888f4ce099d5c84fb738d1c35d0735c7b937",
+                    "mixHash" : "0x248832f6db1a521cd86e101c9503d68495070bfb99223ff1c43f34ec23d00d56",
+                    "nonce" : "0x3f3393f6dbc4911c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06e551b86934bdeec3d752310e90d41bb5ddbd7dea1601b57cc85ae0a5feeafa688ee02e3709fa3582ff85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0248832f6db1a521cd86e101c9503d68495070bfb99223ff1c43f34ec23d00d56883f3393f6dbc4911cf85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa62e86e15e30f671ab23a1d045da3261743fca885e88b01c3d90a96b51c26d79",
+        "lastblockhash" : "0xcf644e10f5b44d79cf77fe8d9e1f888f4ce099d5c84fb738d1c35d0735c7b937",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d92g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9561c285b3bc1ba2031a18f9b55ac23c6a24b68c404415ec3fcd42da6c08c1a7",
-                    "mixHash" : "0x4ace82fa096e07d74a2823f689c35c7bcbe4653c9293b42aa945c4f1edd47a45",
-                    "nonce" : "0x3f74ce5df4e9b82a",
+                    "hash" : "0x223fb533c30fa7780e3830e81e94182b7c21d2e7f0e517e482ab993730a34dc4",
+                    "mixHash" : "0xb2ec33223632c58ae6c234251e1f58826449965a050ae4cc058add6f714f43d4",
+                    "nonce" : "0xa105cfd09029bdd5",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a04ace82fa096e07d74a2823f689c35c7bcbe4653c9293b42aa945c4f1edd47a45883f74ce5df4e9b82af85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b2ec33223632c58ae6c234251e1f58826449965a050ae4cc058add6f714f43d488a105cfd09029bdd5f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9561c285b3bc1ba2031a18f9b55ac23c6a24b68c404415ec3fcd42da6c08c1a7",
+        "lastblockhash" : "0x223fb533c30fa7780e3830e81e94182b7c21d2e7f0e517e482ab993730a34dc4",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d92g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d92g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa348c7552176b63253ccf17c4213d73e70afd2734fcd0cd0d6ce1cdf23b83432",
-                    "mixHash" : "0xe0822111113be7285a31cfe09315b19a27d32a216b6dd616adbfeab79b1aea66",
-                    "nonce" : "0x66d01e3836fb76a4",
+                    "hash" : "0x45bab9ecf684f30458191f58d4a43b7c7862c3a462cf37a4ad60c97d9ef96c2b",
+                    "mixHash" : "0x52dabb390c78eada1010273481c240cf075702a5a6db14a8c18727345cf52f34",
+                    "nonce" : "0xa9c73f27b2dd6934",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xe0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e0822111113be7285a31cfe09315b19a27d32a216b6dd616adbfeab79b1aea668866d01e3836fb76a4f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0e0d591d81e1334883e56bffe538ae73f66af7e3316b7b1fba6d2775230624752a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052dabb390c78eada1010273481c240cf075702a5a6db14a8c18727345cf52f3488a9c73f27b2dd6934f85ff85d800183061a8080830186a08e6001600160016001d960006000f31ba0c5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8a030ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4dc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001d960006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa348c7552176b63253ccf17c4213d73e70afd2734fcd0cd0d6ce1cdf23b83432",
+        "lastblockhash" : "0x45bab9ecf684f30458191f58d4a43b7c7862c3a462cf37a4ad60c97d9ef96c2b",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
index c239aff34..e7c2e5ad4 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d93g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3efd3cb51b7ebe3d6ee89768afd92d9b0d8c1cd11b3c26c3cbc200de2575ce80",
-                    "mixHash" : "0x6d41ebad917074e40c65342f703abc70fbe1135c6ee0ea07fe2f472b628357e2",
-                    "nonce" : "0xe20eff62eb462d57",
+                    "hash" : "0x1c62438d0da26f2ff05f8bd9becaeab0296ce24a72adae077841286dbf79a353",
+                    "mixHash" : "0x22a86116d613816dae06dc0b438713a881d9d6cedff1c0ff25bb4925a60f49db",
+                    "nonce" : "0x9592800a8801a665",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06d41ebad917074e40c65342f703abc70fbe1135c6ee0ea07fe2f472b628357e288e20eff62eb462d57f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022a86116d613816dae06dc0b438713a881d9d6cedff1c0ff25bb4925a60f49db889592800a8801a665f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3efd3cb51b7ebe3d6ee89768afd92d9b0d8c1cd11b3c26c3cbc200de2575ce80",
+        "lastblockhash" : "0x1c62438d0da26f2ff05f8bd9becaeab0296ce24a72adae077841286dbf79a353",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d93g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb75a949507044d49ec2dd20b3c35423d170fcc8196248b7f016f6b0ddaba75d5",
-                    "mixHash" : "0x0802aa41285e2c0cc9737d14bc9fcb8174cd8cce02c9caeb60626bae098d4886",
-                    "nonce" : "0x0a973f50fc3fd007",
+                    "hash" : "0xc08bc57c94d9043bce33c487e071b54db7efd00808e3e64243dba08ee460cdcb",
+                    "mixHash" : "0x6d5da9cf4798c352af7b4b46f8abdd20b29a6eb5677720a40d95338ca8b42f61",
+                    "nonce" : "0xd8c770427c6432e2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00802aa41285e2c0cc9737d14bc9fcb8174cd8cce02c9caeb60626bae098d4886880a973f50fc3fd007f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06d5da9cf4798c352af7b4b46f8abdd20b29a6eb5677720a40d95338ca8b42f6188d8c770427c6432e2f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb75a949507044d49ec2dd20b3c35423d170fcc8196248b7f016f6b0ddaba75d5",
+        "lastblockhash" : "0xc08bc57c94d9043bce33c487e071b54db7efd00808e3e64243dba08ee460cdcb",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d93g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8876db2213aac53ccc1c249887de3545e57a98cd064af195d64ab1a951c675ff",
-                    "mixHash" : "0x77443ea4167ab065d14faa1e9e9e7402069cbcedb35683239272f94badd0490e",
-                    "nonce" : "0x45ceb69ef77b2aa3",
+                    "hash" : "0x31d2df120cdd20e281d70e1eddd2c389750ad7eecd678cfe87394cd5af29c661",
+                    "mixHash" : "0xc33ce1735ec2f0dbc49b0f17be0a667a7d8e9abb0051694e93769d157d381c7b",
+                    "nonce" : "0x83e9f308deb93302",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a077443ea4167ab065d14faa1e9e9e7402069cbcedb35683239272f94badd0490e8845ceb69ef77b2aa3f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c33ce1735ec2f0dbc49b0f17be0a667a7d8e9abb0051694e93769d157d381c7b8883e9f308deb93302f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8876db2213aac53ccc1c249887de3545e57a98cd064af195d64ab1a951c675ff",
+        "lastblockhash" : "0x31d2df120cdd20e281d70e1eddd2c389750ad7eecd678cfe87394cd5af29c661",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d93g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7ce9c4d6f46d34b5e88eb27ead2cf40f51145f34c95c00f265e80820a61600ca",
-                    "mixHash" : "0xa0f1269102cbb2ded7b6d0b4e1331b333534ec264264b6092ea66e004d8d91b5",
-                    "nonce" : "0x036491e589b69729",
+                    "hash" : "0xd586c45d0dce121368f06b6809d332261a1c45ab50c98825ab039f211541dea4",
+                    "mixHash" : "0x345cab7d814578f6b94139205a2bacd27ff81a3e68e5c1fad00b0ef7a026a2cc",
+                    "nonce" : "0x69716f8ce7e49653",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a0f1269102cbb2ded7b6d0b4e1331b333534ec264264b6092ea66e004d8d91b588036491e589b69729f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0345cab7d814578f6b94139205a2bacd27ff81a3e68e5c1fad00b0ef7a026a2cc8869716f8ce7e49653f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ce9c4d6f46d34b5e88eb27ead2cf40f51145f34c95c00f265e80820a61600ca",
+        "lastblockhash" : "0xd586c45d0dce121368f06b6809d332261a1c45ab50c98825ab039f211541dea4",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d93g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x06559fb38d28e22c049e3f2dcacf87d078cc5c7d7f821c721467a38ec7c87d3c",
-                    "mixHash" : "0x0ce495ecb7c99a131ba4a2f5e9c766f0c6cd848a0c60a8865341a283239cd91a",
-                    "nonce" : "0x086148820f9c8a1f",
+                    "hash" : "0xf69f3f37fedec3c65f3259488216da24d17a6c280180685b1cf68682cc31eee5",
+                    "mixHash" : "0x8f2b71d7a943645444e5573ad7d36efe4a989c0e5e5d7160af4b98acf40831c1",
+                    "nonce" : "0xdc3ab6e34b873565",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00ce495ecb7c99a131ba4a2f5e9c766f0c6cd848a0c60a8865341a283239cd91a88086148820f9c8a1ff85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08f2b71d7a943645444e5573ad7d36efe4a989c0e5e5d7160af4b98acf40831c188dc3ab6e34b873565f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06559fb38d28e22c049e3f2dcacf87d078cc5c7d7f821c721467a38ec7c87d3c",
+        "lastblockhash" : "0xf69f3f37fedec3c65f3259488216da24d17a6c280180685b1cf68682cc31eee5",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d93g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d93g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xcc8e672f51279246dc0fccf025a6a7152695e18ab8c7a995751364368b8aae48",
-                    "mixHash" : "0xde5c168a0049ffa6902a02f71bbd8c279c00e096b21a56a3ef5bdcfaef88c712",
-                    "nonce" : "0xc72b3ca61e16797f",
+                    "hash" : "0xabbb9a09308aec13200ccc781334e95e4d079b181c1647a2ce76f2f291ead052",
+                    "mixHash" : "0xca2e8e412deb16036817bd298a660a9227e7a2f36e5c228630280c33ab842298",
+                    "nonce" : "0xbc81021880a58a91",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x5509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0de5c168a0049ffa6902a02f71bbd8c279c00e096b21a56a3ef5bdcfaef88c71288c72b3ca61e16797ff85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea05509f739889796aaff3cbbef565e26306272b36cc0995a842d3f75fab97728b4a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ca2e8e412deb16036817bd298a660a9227e7a2f36e5c228630280c33ab84229888bc81021880a58a91f85ff85d800183061a8080830186a08e6001600160016001da60006000f31ca0bae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884a074886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001da60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc8e672f51279246dc0fccf025a6a7152695e18ab8c7a995751364368b8aae48",
+        "lastblockhash" : "0xabbb9a09308aec13200ccc781334e95e4d079b181c1647a2ce76f2f291ead052",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0.json
index 39ca3797d..dc3d2ee3a 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d94g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x418a82d0409088e06a01e331bb52f25d066f42b0f7e66a9f43e670e781423658",
-                    "mixHash" : "0xab4391adbaa8612c74a1b0b3b74324bbcda612270837316aa4a1847c4b7c7f9b",
-                    "nonce" : "0xea0a5b1d21def155",
+                    "hash" : "0x2b287345f5b99047ef15621dd7675066ee069d807903f506470e9ecdb4b929f8",
+                    "mixHash" : "0x1efc6cbfb800afaf29bb44c14373c1c7e5e722a16d25deebf56c1ee8b6b39c14",
+                    "nonce" : "0x92701a4c3f9ab0e1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ab4391adbaa8612c74a1b0b3b74324bbcda612270837316aa4a1847c4b7c7f9b88ea0a5b1d21def155f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01efc6cbfb800afaf29bb44c14373c1c7e5e722a16d25deebf56c1ee8b6b39c148892701a4c3f9ab0e1f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x418a82d0409088e06a01e331bb52f25d066f42b0f7e66a9f43e670e781423658",
+        "lastblockhash" : "0x2b287345f5b99047ef15621dd7675066ee069d807903f506470e9ecdb4b929f8",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d94g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x63e85da6c3561c56aadff765df221accf40a7b8ce1a17d2af45b665d94240a45",
-                    "mixHash" : "0x6cddf13dd847e950b60cc4ba6f1b9469979a480e64ad20a3953d7546b411cb89",
-                    "nonce" : "0xe75c81c52019837f",
+                    "hash" : "0x702c5db320006b165eafcc80bcb09dede6a0e28025b3307d359da4bea37a20db",
+                    "mixHash" : "0xcc349c82be8fc945a2e5e079ff75d7c268737d2d61da87ef8e540356464582a3",
+                    "nonce" : "0x958210c69d703f00",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06cddf13dd847e950b60cc4ba6f1b9469979a480e64ad20a3953d7546b411cb8988e75c81c52019837ff85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cc349c82be8fc945a2e5e079ff75d7c268737d2d61da87ef8e540356464582a388958210c69d703f00f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63e85da6c3561c56aadff765df221accf40a7b8ce1a17d2af45b665d94240a45",
+        "lastblockhash" : "0x702c5db320006b165eafcc80bcb09dede6a0e28025b3307d359da4bea37a20db",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d94g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x4035e741a26dbd75273e678b92692062ab2d9ee30dd16d07fe219be55cb6daf3",
-                    "mixHash" : "0x49c10369f7aa3abeffa7f484e9c9d16133b1dea10838a04f03ea2f056962ad24",
-                    "nonce" : "0x183c056b63dedcbb",
+                    "hash" : "0xca435012dfc99042c0c0cd98f0d6bb67fc46744749ddf4b66e4af64d03ea04e8",
+                    "mixHash" : "0x22dfb7d26cf0df77dfb9d5f47049ba2f5946c415e72a9bca7acba2c6fe63681d",
+                    "nonce" : "0x1f1d5cf57b168e60",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a049c10369f7aa3abeffa7f484e9c9d16133b1dea10838a04f03ea2f056962ad2488183c056b63dedcbbf85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022dfb7d26cf0df77dfb9d5f47049ba2f5946c415e72a9bca7acba2c6fe63681d881f1d5cf57b168e60f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4035e741a26dbd75273e678b92692062ab2d9ee30dd16d07fe219be55cb6daf3",
+        "lastblockhash" : "0xca435012dfc99042c0c0cd98f0d6bb67fc46744749ddf4b66e4af64d03ea04e8",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d94g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x880bee7bc6fe73dc84580e8bf4b9969312e6dbff9a0781a9c415c93c1e11c91c",
-                    "mixHash" : "0xa43050765a811ad42a40a372f752e71e5e01a28c3e21ac540287f099e2c25464",
-                    "nonce" : "0x285b76e8b0d20051",
+                    "hash" : "0x4226e9f27c5cfadf42b1041fbb204024ae37d91c6029a3418f7c588b92260000",
+                    "mixHash" : "0x8ce642851dbced0c1bb0dabd9c138c6d3b391f9b6ff73ec006c109c1c68201af",
+                    "nonce" : "0xfe945721a85b3cd2",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a43050765a811ad42a40a372f752e71e5e01a28c3e21ac540287f099e2c2546488285b76e8b0d20051f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08ce642851dbced0c1bb0dabd9c138c6d3b391f9b6ff73ec006c109c1c68201af88fe945721a85b3cd2f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x880bee7bc6fe73dc84580e8bf4b9969312e6dbff9a0781a9c415c93c1e11c91c",
+        "lastblockhash" : "0x4226e9f27c5cfadf42b1041fbb204024ae37d91c6029a3418f7c588b92260000",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d94g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xfd90acbe3ef2352e7ff441ec3e0b39a4e8c62c59515d9a4f0a6c18c1096a3ee5",
-                    "mixHash" : "0x18509d3b46874d3670b5dba3a00eb3ed55695e0b7ca23212852b205ca12123d7",
-                    "nonce" : "0xfe74ecb6a22bdf0e",
+                    "hash" : "0x922a9c9d4da02af9e5102a893c0fbb92371563977145d1cf1ea0edac43135650",
+                    "mixHash" : "0x0ba383a5f893bfa1fd429171cea0f86050954f5abf04973559cab599590d3355",
+                    "nonce" : "0xde73b3113c65ef84",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a018509d3b46874d3670b5dba3a00eb3ed55695e0b7ca23212852b205ca12123d788fe74ecb6a22bdf0ef85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00ba383a5f893bfa1fd429171cea0f86050954f5abf04973559cab599590d335588de73b3113c65ef84f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd90acbe3ef2352e7ff441ec3e0b39a4e8c62c59515d9a4f0a6c18c1096a3ee5",
+        "lastblockhash" : "0x922a9c9d4da02af9e5102a893c0fbb92371563977145d1cf1ea0edac43135650",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d94g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d94g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbcb76fdaed5497be481bf4375509147076beac5862c26567f4f293bd0ca04d91",
-                    "mixHash" : "0x91a342d55c66ef27c84a2173ecb88808f19cf62875039b77ad193d93d8d365f1",
-                    "nonce" : "0x82e1b8cca33f0f1f",
+                    "hash" : "0xfda21f1a27cc592c1cbe5638b3149e430844310b41fc111a4132881fc0ac2902",
+                    "mixHash" : "0xa88075e320ab8fdc006bfde8f98e649bdf9a13a761f94be4af842c2bc95e574f",
+                    "nonce" : "0xf94fc36570e88b60",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a091a342d55c66ef27c84a2173ecb88808f19cf62875039b77ad193d93d8d365f18882e1b8cca33f0f1ff85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0666434e178cb517758a81a2e69db9284b4b88450d1e0492649f8a069b7f55a5aa054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a88075e320ab8fdc006bfde8f98e649bdf9a13a761f94be4af842c2bc95e574f88f94fc36570e88b60f85ff85d800183061a8080830186a08e6001600160016001db60006000f31ba0155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34a077eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441bc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001db60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcb76fdaed5497be481bf4375509147076beac5862c26567f4f293bd0ca04d91",
+        "lastblockhash" : "0xfda21f1a27cc592c1cbe5638b3149e430844310b41fc111a4132881fc0ac2902",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0.json
index 6dd8308ab..060aa2354 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d95g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc89f6c535a0bdca4fa6f0006dca869953d36b98377e274deee2fa05c6408a5af",
-                    "mixHash" : "0x0da76e905f9c5bdcd979614c06373386000bf62fe17b8a8b3cc749fa6314b1e6",
-                    "nonce" : "0x50a8cedcbea813c8",
+                    "hash" : "0xc6b5e2636cd7429ccfbb3afcc3effa84dee2542867e048768060964b4851da0c",
+                    "mixHash" : "0xce49001ac3d31b55047e4c49a04ac061109e7f183993bb24b6a5f96a1aafef70",
+                    "nonce" : "0x4cf9f4b3d4e02583",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00da76e905f9c5bdcd979614c06373386000bf62fe17b8a8b3cc749fa6314b1e68850a8cedcbea813c8f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ce49001ac3d31b55047e4c49a04ac061109e7f183993bb24b6a5f96a1aafef70884cf9f4b3d4e02583f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc89f6c535a0bdca4fa6f0006dca869953d36b98377e274deee2fa05c6408a5af",
+        "lastblockhash" : "0xc6b5e2636cd7429ccfbb3afcc3effa84dee2542867e048768060964b4851da0c",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d95g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x2342ba96f24bb23b11d1796bce831860d9c5114e693724a4ddc7047fd9bb0c38",
-                    "mixHash" : "0xe350d33a3def0ad440a8c4f867c45c5a07f5528165953c82c289ae6dc2800ba9",
-                    "nonce" : "0x350da1217b096d83",
+                    "hash" : "0x294345223560566ffcd89fa823914fff9c5ba82b16e6bf3e738e4c51c0b8f261",
+                    "mixHash" : "0xc52f90d8950d7188890845d67a4418430b809266561474f3ce518cc99734e8d0",
+                    "nonce" : "0x6c909593212228bc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e350d33a3def0ad440a8c4f867c45c5a07f5528165953c82c289ae6dc2800ba988350da1217b096d83f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c52f90d8950d7188890845d67a4418430b809266561474f3ce518cc99734e8d0886c909593212228bcf85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2342ba96f24bb23b11d1796bce831860d9c5114e693724a4ddc7047fd9bb0c38",
+        "lastblockhash" : "0x294345223560566ffcd89fa823914fff9c5ba82b16e6bf3e738e4c51c0b8f261",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d95g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd3f39090d7d3d665f1af784b0ad6b0bc6dc135aa8135bd023d3c769ebaca8695",
-                    "mixHash" : "0x99d20cef5acb77efac4ad47de32c4de11ad139f09fc95432945e34eeb55aba65",
-                    "nonce" : "0x2835e3e76e3bb693",
+                    "hash" : "0x1f2dfd7aaa6768811cb3977dc75f0e8e902e6e4ebf447f4737a61f0b357e409e",
+                    "mixHash" : "0xeff52c861e0a548ff9a2c0a4e79eb6f1295cfb3be13b36c3c5ad109a0edfa8d4",
+                    "nonce" : "0x7144bcde84c40de1",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a099d20cef5acb77efac4ad47de32c4de11ad139f09fc95432945e34eeb55aba65882835e3e76e3bb693f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eff52c861e0a548ff9a2c0a4e79eb6f1295cfb3be13b36c3c5ad109a0edfa8d4887144bcde84c40de1f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3f39090d7d3d665f1af784b0ad6b0bc6dc135aa8135bd023d3c769ebaca8695",
+        "lastblockhash" : "0x1f2dfd7aaa6768811cb3977dc75f0e8e902e6e4ebf447f4737a61f0b357e409e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d95g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xdae57fcf743455b274546cdb4a47e93d20beae9c3093a0e1a13fd10e8d728f98",
-                    "mixHash" : "0x3a698433e1f39158d064ca1c2fa2df6753c61c2face214ee9dd9d389a05d60f2",
-                    "nonce" : "0xefe19407fbb7cbdf",
+                    "hash" : "0x419d6e830a4e12b441589b0d1b40bb9987524079ff8d59b2d7bbf2febaa364ed",
+                    "mixHash" : "0x8f283d5d30ee8b01183b8dde1234b67f65bcb0e4fee438bdfbacc9ba9085d431",
+                    "nonce" : "0xbdcf221515f479fc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03a698433e1f39158d064ca1c2fa2df6753c61c2face214ee9dd9d389a05d60f288efe19407fbb7cbdff85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a08f283d5d30ee8b01183b8dde1234b67f65bcb0e4fee438bdfbacc9ba9085d43188bdcf221515f479fcf85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdae57fcf743455b274546cdb4a47e93d20beae9c3093a0e1a13fd10e8d728f98",
+        "lastblockhash" : "0x419d6e830a4e12b441589b0d1b40bb9987524079ff8d59b2d7bbf2febaa364ed",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d95g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb1acb0a0c9b596c32b0b0985f0d502b64ded8efc6db39c2bcd8f31193f756bf7",
-                    "mixHash" : "0xd2b38f43aaa007edecc7042e1077e2cae38f3eff795ba7d5a1e0589756fef637",
-                    "nonce" : "0xca10d8c17faa234d",
+                    "hash" : "0xfa50c3c979dee4899c7c4efdaf11dfda3e31fecc8ea949a876e8a717f56d3192",
+                    "mixHash" : "0x56ab5ae636540d38bc4fb788f6311b766f9cb8e8488515b6945bdcbbc8650276",
+                    "nonce" : "0x92c49b72ab768e27",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d2b38f43aaa007edecc7042e1077e2cae38f3eff795ba7d5a1e0589756fef63788ca10d8c17faa234df85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a056ab5ae636540d38bc4fb788f6311b766f9cb8e8488515b6945bdcbbc86502768892c49b72ab768e27f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1acb0a0c9b596c32b0b0985f0d502b64ded8efc6db39c2bcd8f31193f756bf7",
+        "lastblockhash" : "0xfa50c3c979dee4899c7c4efdaf11dfda3e31fecc8ea949a876e8a717f56d3192",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d95g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d95g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x889087e45961e2ec703240afc2fb1e176a6d77e77dd7a9fee661bed380c66d84",
-                    "mixHash" : "0x44a00e79dee434f2eaf9d367ad4daf34f187492103fd1adb000fd2efae2cd9c6",
-                    "nonce" : "0x6e56fba32ee8a9b1",
+                    "hash" : "0x5986bf9fbaea89dee8cc9ee705fab304ebe4750220066e97203a695b0bbf179a",
+                    "mixHash" : "0x3cff496e464e4ca02ea4260b49aaa2e11b8b210b587c204c22edb00e5de903a8",
+                    "nonce" : "0x58035db015569ccc",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x8ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a044a00e79dee434f2eaf9d367ad4daf34f187492103fd1adb000fd2efae2cd9c6886e56fba32ee8a9b1f85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea08ed6fcd76ad572e5431622ccbe7f091946a68b986da321929088cfeaca1c82d9a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03cff496e464e4ca02ea4260b49aaa2e11b8b210b587c204c22edb00e5de903a88858035db015569cccf85ff85d800183061a8080830186a08e6001600160016001dc60006000f31ba020b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57a05b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718fc0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dc60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x889087e45961e2ec703240afc2fb1e176a6d77e77dd7a9fee661bed380c66d84",
+        "lastblockhash" : "0x5986bf9fbaea89dee8cc9ee705fab304ebe4750220066e97203a695b0bbf179a",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0.json
index e7534d40c..c7d73a053 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d96g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x0dfcfb7fde9c76592a1df7d04eee7d7c99c125e9b2ca29350b0ef5e9282366b2",
-                    "mixHash" : "0x1fd4ee7968451f7c7818f011c185e0caf339e3b43801528118c189c8e988d4cc",
-                    "nonce" : "0xd528f04b3889839a",
+                    "hash" : "0x805d45ed8bc4d32c06e5789db0ef85ed808c678df0444071794734031abb66c9",
+                    "mixHash" : "0xc18f0dacc7061d09ffd94c955f4edf99d3c436656f926863b36e7a3e20cbc5e8",
+                    "nonce" : "0x54071536f18ab62a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01fd4ee7968451f7c7818f011c185e0caf339e3b43801528118c189c8e988d4cc88d528f04b3889839af85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c18f0dacc7061d09ffd94c955f4edf99d3c436656f926863b36e7a3e20cbc5e88854071536f18ab62af85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dfcfb7fde9c76592a1df7d04eee7d7c99c125e9b2ca29350b0ef5e9282366b2",
+        "lastblockhash" : "0x805d45ed8bc4d32c06e5789db0ef85ed808c678df0444071794734031abb66c9",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d96g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x456a1d9511118fe06ef1d1214140f6d0e6560eac1a2541c77b17fed64ea0dc4a",
-                    "mixHash" : "0x25d2303d30a484a76bfc8112959e75acb6a404f90cb6329a8d0059af57ee410d",
-                    "nonce" : "0x76f9d7a0400eff6b",
+                    "hash" : "0x7861a328d8c7a86235497e85d6adde74dadb97e9fef68ca36a1c725459cb6c22",
+                    "mixHash" : "0x5a887dc0735aba8dcb982a2f7424370b0720396878b29c0a5cfe0c8a62fecb52",
+                    "nonce" : "0x424f0e48cf2e07d6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a025d2303d30a484a76bfc8112959e75acb6a404f90cb6329a8d0059af57ee410d8876f9d7a0400eff6bf85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05a887dc0735aba8dcb982a2f7424370b0720396878b29c0a5cfe0c8a62fecb5288424f0e48cf2e07d6f85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x456a1d9511118fe06ef1d1214140f6d0e6560eac1a2541c77b17fed64ea0dc4a",
+        "lastblockhash" : "0x7861a328d8c7a86235497e85d6adde74dadb97e9fef68ca36a1c725459cb6c22",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d96g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7b48d7c24f67cd15f12296ffada582d93461049c917dc06c03d5644b6216333d",
-                    "mixHash" : "0x11151f7eb2b26742a3cd8962aa698c4c1d2ae7ad26021841616bbac94f60f399",
-                    "nonce" : "0x93bd2f0a0f01ad6e",
+                    "hash" : "0xf54809c218e2b7e966a0fecbcdae41d35ad746c57762bac78b1353d9dea7b085",
+                    "mixHash" : "0x2ace73b8df6ea7fe986fff47bdd8083067dd4192be88b4b7b0c2241aafc28b45",
+                    "nonce" : "0xcb81f1097c1362a4",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a011151f7eb2b26742a3cd8962aa698c4c1d2ae7ad26021841616bbac94f60f3998893bd2f0a0f01ad6ef85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02ace73b8df6ea7fe986fff47bdd8083067dd4192be88b4b7b0c2241aafc28b4588cb81f1097c1362a4f85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b48d7c24f67cd15f12296ffada582d93461049c917dc06c03d5644b6216333d",
+        "lastblockhash" : "0xf54809c218e2b7e966a0fecbcdae41d35ad746c57762bac78b1353d9dea7b085",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d96g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x8ea3725dad52281c0b6035bbe4f0cade8569e1c892cca5b3f521bba074a1526d",
-                    "mixHash" : "0x5c644a40a5005977a34d8a8785287e0d01b570a862ca40d312264a3dffc080aa",
-                    "nonce" : "0x2c1e84f4577c2185",
+                    "hash" : "0x023b463d8145d1c72399ab4cdc66b48da8bdc0da9128c6c43ef2542d88ff0c1d",
+                    "mixHash" : "0x46fec83019134e17f80840b6c11a19dd469a7cf80cf22d946d21447d1820b5a3",
+                    "nonce" : "0x03b4a96ee4187cba",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05c644a40a5005977a34d8a8785287e0d01b570a862ca40d312264a3dffc080aa882c1e84f4577c2185f85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a046fec83019134e17f80840b6c11a19dd469a7cf80cf22d946d21447d1820b5a38803b4a96ee4187cbaf85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ea3725dad52281c0b6035bbe4f0cade8569e1c892cca5b3f521bba074a1526d",
+        "lastblockhash" : "0x023b463d8145d1c72399ab4cdc66b48da8bdc0da9128c6c43ef2542d88ff0c1d",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d96g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa1387db5858e8fbba39f5823aef54073dbbba9b69263a9b220414c168bb6c486",
-                    "mixHash" : "0x896b8a1b9a0d85bde845cd3a3b542407257ec87468270312cc063e5da7dba18f",
-                    "nonce" : "0x965abffb374f27e2",
+                    "hash" : "0xd8afdc6f9cc390fa3f446af5d0de80f32e665f6082886889a1558fd808fceeb8",
+                    "mixHash" : "0xa281e094293cb992a7fea3308f007f5a3d82c67b554ea8d3d03c22648decd839",
+                    "nonce" : "0xa110da2873628a4e",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0896b8a1b9a0d85bde845cd3a3b542407257ec87468270312cc063e5da7dba18f88965abffb374f27e2f85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a281e094293cb992a7fea3308f007f5a3d82c67b554ea8d3d03c22648decd83988a110da2873628a4ef85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1387db5858e8fbba39f5823aef54073dbbba9b69263a9b220414c168bb6c486",
+        "lastblockhash" : "0xd8afdc6f9cc390fa3f446af5d0de80f32e665f6082886889a1558fd808fceeb8",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d96g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d96g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7e6924714ba453d1bc1675c07efc6faee00650a0b622be46990a630afb4e2bbf",
-                    "mixHash" : "0x201b58b1c491936f15a951662d0d61039cabc6f3136197cfa37265d524ee30b1",
-                    "nonce" : "0xd8e1032eb416b92e",
+                    "hash" : "0x740973dac3774046cd856df3a767f0b34bda92514476e02f88dc7ac3420727ae",
+                    "mixHash" : "0x0d4849717068a2b1889beb84eed20f5afd67d2ee6717931df567c2093c064acd",
+                    "nonce" : "0x24e07de90cca551a",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x99bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0201b58b1c491936f15a951662d0d61039cabc6f3136197cfa37265d524ee30b188d8e1032eb416b92ef85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea099bca7cf78d9e6ce7bf46257756bc26b13cb081807add856d41f601fd5f9496da054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00d4849717068a2b1889beb84eed20f5afd67d2ee6717931df567c2093c064acd8824e07de90cca551af85ff85d800183061a8080830186a08e6001600160016001dd60006000f31ca0a61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7aa03029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7ec0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001dd60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e6924714ba453d1bc1675c07efc6faee00650a0b622be46990a630afb4e2bbf",
+        "lastblockhash" : "0x740973dac3774046cd856df3a767f0b34bda92514476e02f88dc7ac3420727ae",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0.json
index 3e9ef4a37..dc7065417 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d97g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x6cd96db8d388a5a7579a3b75e0c918813d7c1d9544a1a73e805d61b17fbd8b6e",
-                    "mixHash" : "0x954d1699b256b0e142bd29e231401fa31080a93082eb14b7c468821abef81872",
-                    "nonce" : "0x348cd5782ef7e889",
+                    "hash" : "0x8274a4ade36aea1d06827bcef6f47dd9724cb04aea11df73329010fa69f8f4c6",
+                    "mixHash" : "0xc4804253385186de39c415cf53f63413ddaa32e2df3b96f3a0ad831d3f31dd62",
+                    "nonce" : "0xd9f620189567349f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0954d1699b256b0e142bd29e231401fa31080a93082eb14b7c468821abef8187288348cd5782ef7e889f85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c4804253385186de39c415cf53f63413ddaa32e2df3b96f3a0ad831d3f31dd6288d9f620189567349ff85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cd96db8d388a5a7579a3b75e0c918813d7c1d9544a1a73e805d61b17fbd8b6e",
+        "lastblockhash" : "0x8274a4ade36aea1d06827bcef6f47dd9724cb04aea11df73329010fa69f8f4c6",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d97g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7ff0f33d8eaf112b2b1b131dc6e3d42cd53caac155c44a8df9ea37aa451cb4b5",
-                    "mixHash" : "0xef96ed9f752beecf6da5489ddfde22eedae21ee3db25ab6d8ab96b8523d3214b",
-                    "nonce" : "0x89717adc5f1bc36d",
+                    "hash" : "0xf3d6a18b9947ad7ecd876bebefacd443435cb1b95d82e5eb5d59e0e63838e232",
+                    "mixHash" : "0xe0148e82504fd3401eb7e9a64dce258658cd95e1105d572f174427bfc9ff8406",
+                    "nonce" : "0x51787ef503612172",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ef96ed9f752beecf6da5489ddfde22eedae21ee3db25ab6d8ab96b8523d3214b8889717adc5f1bc36df85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e0148e82504fd3401eb7e9a64dce258658cd95e1105d572f174427bfc9ff84068851787ef503612172f85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ff0f33d8eaf112b2b1b131dc6e3d42cd53caac155c44a8df9ea37aa451cb4b5",
+        "lastblockhash" : "0xf3d6a18b9947ad7ecd876bebefacd443435cb1b95d82e5eb5d59e0e63838e232",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d97g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7a1e6e2bc2a93569a2b25078e90da7d4a420ce58a07afc93232fe666f352b2c0",
-                    "mixHash" : "0x00f807ee5a31ec93206f06682e9d9fc9340858a5d893a14dca23ccf7812ac163",
-                    "nonce" : "0x32388c0c53ebb87b",
+                    "hash" : "0x34f761372d75d2d45aaa9ddd2bd4601f5a6a4a4d9ad7ad286939367123991a49",
+                    "mixHash" : "0xeafc7f30b9c30c15d6a73aa7a667a3c213fac42eedbe3c7b4d8add6033d28a6a",
+                    "nonce" : "0x4396dce3de55635b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a000f807ee5a31ec93206f06682e9d9fc9340858a5d893a14dca23ccf7812ac1638832388c0c53ebb87bf85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0eafc7f30b9c30c15d6a73aa7a667a3c213fac42eedbe3c7b4d8add6033d28a6a884396dce3de55635bf85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7a1e6e2bc2a93569a2b25078e90da7d4a420ce58a07afc93232fe666f352b2c0",
+        "lastblockhash" : "0x34f761372d75d2d45aaa9ddd2bd4601f5a6a4a4d9ad7ad286939367123991a49",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d97g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5d638e579ad1a8ed9fc0217f6b2f6be9d2e9b248577f43e0f74fda2af29e7810",
-                    "mixHash" : "0x1a5d2934118ff7f17db824ef4a65a1e6ba14197c8762c83a14faf92ac3351c32",
-                    "nonce" : "0x635d8bcab4984180",
+                    "hash" : "0x2178e9c8f6b474c867167836ae3eba80ab44d72d98152aa078493999d966775b",
+                    "mixHash" : "0x5096620786a1fbcc23eb629183310eb19d982bc6bee5baf00db3462833850ba6",
+                    "nonce" : "0x75e0fc824e9e734f",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01a5d2934118ff7f17db824ef4a65a1e6ba14197c8762c83a14faf92ac3351c3288635d8bcab4984180f85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05096620786a1fbcc23eb629183310eb19d982bc6bee5baf00db3462833850ba68875e0fc824e9e734ff85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d638e579ad1a8ed9fc0217f6b2f6be9d2e9b248577f43e0f74fda2af29e7810",
+        "lastblockhash" : "0x2178e9c8f6b474c867167836ae3eba80ab44d72d98152aa078493999d966775b",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d97g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xb0a43c7d93e0235340b053d4e888792c128c658b350859b44669203f049e7887",
-                    "mixHash" : "0x6ecd77d43b428c0fac9e54e53d8c1cb6549f0188c62609cd9a020715af1cdb90",
-                    "nonce" : "0x51b1d48859ce04b3",
+                    "hash" : "0x3a58f5154d5ab30b680692470d474fbdc04ce0f84bcc7920e1f4599f94fa6f53",
+                    "mixHash" : "0x41c25ec6245b33eda14e2462174450a3da50175957be380d093a46e1a19f5356",
+                    "nonce" : "0x8788a2d24a6e6532",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a06ecd77d43b428c0fac9e54e53d8c1cb6549f0188c62609cd9a020715af1cdb908851b1d48859ce04b3f85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a041c25ec6245b33eda14e2462174450a3da50175957be380d093a46e1a19f5356888788a2d24a6e6532f85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0a43c7d93e0235340b053d4e888792c128c658b350859b44669203f049e7887",
+        "lastblockhash" : "0x3a58f5154d5ab30b680692470d474fbdc04ce0f84bcc7920e1f4599f94fa6f53",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d97g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d97g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xbc540d0ae8c4205598bf76c2be9a01fae92bdbe1fab1fc93302df761ff681bae",
-                    "mixHash" : "0xbead6eb392ffde7a5f91c0ffe1cda87dc6b00a3be08f6a63125bbaf33baea64c",
-                    "nonce" : "0xf24e39fd8b996c4e",
+                    "hash" : "0xd1be9afc7ffaf7ea91eb4ec8bf6c041165d734d7987610899d5aff73b7bf8115",
+                    "mixHash" : "0x2efcd427cb7865f454f5ea2897d4e17dcb3e7f2f8a9e08eb382ff2f4f9cfbee0",
+                    "nonce" : "0x83ad6518ac105b1b",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x7640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bead6eb392ffde7a5f91c0ffe1cda87dc6b00a3be08f6a63125bbaf33baea64c88f24e39fd8b996c4ef85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea07640fe13dbdad626dacb412d3c4b57adc4eb4d20e3d8f75b7777bd27534ff0c7a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a02efcd427cb7865f454f5ea2897d4e17dcb3e7f2f8a9e08eb382ff2f4f9cfbee08883ad6518ac105b1bf85ff85d800183061a8080830186a08e6001600160016001de60006000f31ba054a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeba01d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001de60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc540d0ae8c4205598bf76c2be9a01fae92bdbe1fab1fc93302df761ff681bae",
+        "lastblockhash" : "0xd1be9afc7ffaf7ea91eb4ec8bf6c041165d734d7987610899d5aff73b7bf8115",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0.json
index b43f53958..31aaa5dbc 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d98g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x82bccf64616d9a227c5f831f40fa4cc42f1af6285153420547c90fd4f95807b9",
-                    "mixHash" : "0xb0b145d092a16b2615418f090bec2b4579ac4bafbe935abd9d3f3afbc297b837",
-                    "nonce" : "0x3b2ff50b082dd87a",
+                    "hash" : "0x9f91de154ae1a182936168d0ef1979d5f0280ab5317c8ec98363b57c5751cc76",
+                    "mixHash" : "0x86c5c2d50049455845ac8084dc008282ffa27a4c2e5aad73e843cd4ffb0c166a",
+                    "nonce" : "0xd10f3409ffe1bbbe",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b0b145d092a16b2615418f090bec2b4579ac4bafbe935abd9d3f3afbc297b837883b2ff50b082dd87af85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a086c5c2d50049455845ac8084dc008282ffa27a4c2e5aad73e843cd4ffb0c166a88d10f3409ffe1bbbef85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82bccf64616d9a227c5f831f40fa4cc42f1af6285153420547c90fd4f95807b9",
+        "lastblockhash" : "0x9f91de154ae1a182936168d0ef1979d5f0280ab5317c8ec98363b57c5751cc76",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d98g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3fd7a38acc23fc6f67dd4bbee898199a99c99cd1a0b0fa02bb75e085dcbb6685",
-                    "mixHash" : "0x05d978d60c999706a9a0d0e21486c1699d8660e0c0c6147c82e63d08bc26ab08",
-                    "nonce" : "0x63ce76269cc9eac0",
+                    "hash" : "0x98f8ddac40acf36873aa3aa7fd404b47ac38eea9275e5239d05cf0b367f864dd",
+                    "mixHash" : "0x85c606d74595903ec52f36f5b03f946268b97477f55efc83b6c7bf55b8ab4568",
+                    "nonce" : "0x444408667b003281",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a005d978d60c999706a9a0d0e21486c1699d8660e0c0c6147c82e63d08bc26ab088863ce76269cc9eac0f85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a085c606d74595903ec52f36f5b03f946268b97477f55efc83b6c7bf55b8ab456888444408667b003281f85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fd7a38acc23fc6f67dd4bbee898199a99c99cd1a0b0fa02bb75e085dcbb6685",
+        "lastblockhash" : "0x98f8ddac40acf36873aa3aa7fd404b47ac38eea9275e5239d05cf0b367f864dd",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d98g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3d6d2a0c8f3645b003e14435567108fe5d01a42e2918c871583f937c38778c60",
-                    "mixHash" : "0x66bd040519fdb313ed8cb228d727c897fd59745b7691c39e4635bd6176c467fa",
-                    "nonce" : "0x12d10ac654cfd51e",
+                    "hash" : "0x8edaf7b7e244a9a2364dfaf49c90c22293620e3e55f37a341bea9ca78e28ea3e",
+                    "mixHash" : "0xffd03ab6ec2c7ca07043bc4184fadfef9ab17198402536b3dec5d4941c305446",
+                    "nonce" : "0xa71171bfb1d40271",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a066bd040519fdb313ed8cb228d727c897fd59745b7691c39e4635bd6176c467fa8812d10ac654cfd51ef85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0ffd03ab6ec2c7ca07043bc4184fadfef9ab17198402536b3dec5d4941c30544688a71171bfb1d40271f85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d6d2a0c8f3645b003e14435567108fe5d01a42e2918c871583f937c38778c60",
+        "lastblockhash" : "0x8edaf7b7e244a9a2364dfaf49c90c22293620e3e55f37a341bea9ca78e28ea3e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d98g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7d5233392149eb6afc2219d11aea8c30127c125dbf7f42d7523defa25a15b184",
-                    "mixHash" : "0xcad8faa85453ae8814ddf7a680553e3c97d72f0d28e9ad9443fdad0842153db9",
-                    "nonce" : "0x507fa36605ac9fbe",
+                    "hash" : "0xc5b1a72a7666115cc08b0b2e910669864c1486d90ae629a10d5ae5037ae4ebc1",
+                    "mixHash" : "0x52dae6ae2201fa602c9f6292e4fb369c739fd9464d10f15c9ee89acd970f84de",
+                    "nonce" : "0x0b948ee7655ffbe9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0cad8faa85453ae8814ddf7a680553e3c97d72f0d28e9ad9443fdad0842153db988507fa36605ac9fbef85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a052dae6ae2201fa602c9f6292e4fb369c739fd9464d10f15c9ee89acd970f84de880b948ee7655ffbe9f85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5233392149eb6afc2219d11aea8c30127c125dbf7f42d7523defa25a15b184",
+        "lastblockhash" : "0xc5b1a72a7666115cc08b0b2e910669864c1486d90ae629a10d5ae5037ae4ebc1",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d98g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x7abd55b8e5f742f820379bbac9c8b94ae9a481a65d9adc6d256a38ac8b5881a3",
-                    "mixHash" : "0xbc8864824507656d0a2f0858c3ea207c966b7e834accc9c3e182ef682fea88bc",
-                    "nonce" : "0x6ce65688eef31bdd",
+                    "hash" : "0xbe09ab23395ed18ce0cb6b88fb091d1ace4ee0bc0f39b7eba6ef2a18b9a44531",
+                    "mixHash" : "0x430b835cf411f08eb5175cf5e944f2c52aacc4a8fa3fe52820e40667b66d6a01",
+                    "nonce" : "0x490148d14564147d",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0bc8864824507656d0a2f0858c3ea207c966b7e834accc9c3e182ef682fea88bc886ce65688eef31bddf85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0430b835cf411f08eb5175cf5e944f2c52aacc4a8fa3fe52820e40667b66d6a0188490148d14564147df85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7abd55b8e5f742f820379bbac9c8b94ae9a481a65d9adc6d256a38ac8b5881a3",
+        "lastblockhash" : "0xbe09ab23395ed18ce0cb6b88fb091d1ace4ee0bc0f39b7eba6ef2a18b9a44531",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d98g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d98g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x9b379a227be4f4f966c0fe568f8a2b459ad39ec931e0fd5038daea5aef108567",
-                    "mixHash" : "0x5f488fea3f2816ee689535d0991e410cb64a605159a56ecb6aafdbe16bfe9f28",
-                    "nonce" : "0x1e0ad67fe962ca7d",
+                    "hash" : "0xd14e144b05cb93c9937396e1149e8cc6eb66fcca976f8496aaeef46a586ae4b6",
+                    "mixHash" : "0x0b62cc6f6b99f40d503cc2d286867b86981a699fbd2efb0ccaa40e5184413f51",
+                    "nonce" : "0xfdbd73a5c9ef510c",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xdd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a05f488fea3f2816ee689535d0991e410cb64a605159a56ecb6aafdbe16bfe9f28881e0ad67fe962ca7df85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0dd7334b13777affaae0d6494037eb0628c9b8745277d77d883eb637b67c07473a054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00b62cc6f6b99f40d503cc2d286867b86981a699fbd2efb0ccaa40e5184413f5188fdbd73a5c9ef510cf85ff85d800183061a8080830186a08e6001600160016001df60006000f31ba056fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498da0525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001df60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b379a227be4f4f966c0fe568f8a2b459ad39ec931e0fd5038daea5aef108567",
+        "lastblockhash" : "0xd14e144b05cb93c9937396e1149e8cc6eb66fcca976f8496aaeef46a586ae4b6",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
index 3b42b9302..4e62ffe08 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d99g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa0eb6bb299ed36efa6deabcf3d9e845a9b08345bfb09d84191773205bfe65220",
-                    "mixHash" : "0x22e5a87d3a81005e8df2c5b413a50b3a71861b24d2f1e6efa46be4d57e6696dd",
-                    "nonce" : "0xf0c7215b684f48b4",
+                    "hash" : "0xdb1f81c2dc085979ec0453913d5d716b1c5b0fb644a74c7f3813ba3e3139b26e",
+                    "mixHash" : "0x9bb8e2e6ef79ee5d5d092119d6c467c8846f1dfcfc018a3ed54dd1650310d04c",
+                    "nonce" : "0x4394948aed1a0757",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a022e5a87d3a81005e8df2c5b413a50b3a71861b24d2f1e6efa46be4d57e6696dd88f0c7215b684f48b4f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a09bb8e2e6ef79ee5d5d092119d6c467c8846f1dfcfc018a3ed54dd1650310d04c884394948aed1a0757f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0eb6bb299ed36efa6deabcf3d9e845a9b08345bfb09d84191773205bfe65220",
+        "lastblockhash" : "0xdb1f81c2dc085979ec0453913d5d716b1c5b0fb644a74c7f3813ba3e3139b26e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d99g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x47ba5c48b89df2a59b0e40edd28cef5f8e49ad8a75bc4f6fb96b8a7eafed630b",
-                    "mixHash" : "0x1385d8f708df6db3adeafa447bc530101655c4752dd0e7e03d053843ca8dc597",
-                    "nonce" : "0x9908dc0b9eb46dbb",
+                    "hash" : "0xa273d47f7da1192a3f754af0e49dc11c01fa252c924e692788e5a376e4f0be1d",
+                    "mixHash" : "0xb6777eaedc80ccb95aa325cd2fdecdc4cf1058cd467759a4cdc15dab65cb7ade",
+                    "nonce" : "0x6db24a7e859863b7",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a01385d8f708df6db3adeafa447bc530101655c4752dd0e7e03d053843ca8dc597889908dc0b9eb46dbbf85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0b6777eaedc80ccb95aa325cd2fdecdc4cf1058cd467759a4cdc15dab65cb7ade886db24a7e859863b7f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47ba5c48b89df2a59b0e40edd28cef5f8e49ad8a75bc4f6fb96b8a7eafed630b",
+        "lastblockhash" : "0xa273d47f7da1192a3f754af0e49dc11c01fa252c924e692788e5a376e4f0be1d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d99g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xd56078c03af38b02cefdf56eeadd1e8e606b18934db6d53d129d02107e4f780d",
-                    "mixHash" : "0x394a4cec672c627dca9171890c0e7dee0e50a7c8b3819cc1d4168427995ee013",
-                    "nonce" : "0x4e2768a689ec8907",
+                    "hash" : "0x665664f069e9d59b45a88ed13ca647d8705136d2a728e3ec96d5402a9ff4c0b2",
+                    "mixHash" : "0xe8f71e816e949545c3db93c6ccab45789d7b7be627b8e50b1e2f1cf59128c24e",
+                    "nonce" : "0x83dd0712f51720d9",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0394a4cec672c627dca9171890c0e7dee0e50a7c8b3819cc1d4168427995ee013884e2768a689ec8907f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e8f71e816e949545c3db93c6ccab45789d7b7be627b8e50b1e2f1cf59128c24e8883dd0712f51720d9f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd56078c03af38b02cefdf56eeadd1e8e606b18934db6d53d129d02107e4f780d",
+        "lastblockhash" : "0x665664f069e9d59b45a88ed13ca647d8705136d2a728e3ec96d5402a9ff4c0b2",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d99g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x76bfccb8afffd208df3a9042acb32fd674264afbb1274c5d633b45fd176b152c",
-                    "mixHash" : "0x360352005d9689134c1d51d06aa94555109623d837ecbbe17429cf6d21abd71e",
-                    "nonce" : "0x28da9f1e2b80c147",
+                    "hash" : "0xdd75062fe98abbcd2a586330984acca4cf8d336f525e92f9dcc03cbc406a5b5a",
+                    "mixHash" : "0x08b6841b31bdc3eccb55a97046dd5dc5e7a6156e362d7a7dc7a25dae6fda3339",
+                    "nonce" : "0x9938297bdf076044",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0360352005d9689134c1d51d06aa94555109623d837ecbbe17429cf6d21abd71e8828da9f1e2b80c147f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a008b6841b31bdc3eccb55a97046dd5dc5e7a6156e362d7a7dc7a25dae6fda3339889938297bdf076044f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76bfccb8afffd208df3a9042acb32fd674264afbb1274c5d633b45fd176b152c",
+        "lastblockhash" : "0xdd75062fe98abbcd2a586330984acca4cf8d336f525e92f9dcc03cbc406a5b5a",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d99g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa340487238971074a0f5cd738b32e1c078e4fb47333d97fce41d1261f5a5e20d",
-                    "mixHash" : "0xe32d89a59a7b81152be6bb44fc8404f2a6d8eb87eb72ab82ca4893f5e6367648",
-                    "nonce" : "0x4d9acccb762a06b3",
+                    "hash" : "0x3c32ce9fdbf8c5de35c24f328cbb4d97df35c5a8dc12493b8a3528fbf579eb44",
+                    "mixHash" : "0x82ce03a82b0f80e9ab4c859105f4a4a2b9d516729f20ae23a2abe3bac0fead64",
+                    "nonce" : "0xbe1ef4a0b4093e57",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e32d89a59a7b81152be6bb44fc8404f2a6d8eb87eb72ab82ca4893f5e6367648884d9acccb762a06b3f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a082ce03a82b0f80e9ab4c859105f4a4a2b9d516729f20ae23a2abe3bac0fead6488be1ef4a0b4093e57f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa340487238971074a0f5cd738b32e1c078e4fb47333d97fce41d1261f5a5e20d",
+        "lastblockhash" : "0x3c32ce9fdbf8c5de35c24f328cbb4d97df35c5a8dc12493b8a3528fbf579eb44",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d99g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d99g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa02438112a657c627e246ce6a2597e708c29cbe0e090b8c1a064deedfd2e1d74",
-                    "mixHash" : "0xa20cc3b2e3979279d789a951cd8e7f75cb10b4d6b13db55868a6239656d88c46",
-                    "nonce" : "0xa4a8c32315a720fe",
+                    "hash" : "0x1ccf4864d443ab55edaff976dff0a1002ac382f836a74e66500eec78a05f7066",
+                    "mixHash" : "0x071784e12cf3fa539fffa8cf33d397aa6939b44f0bfde42c0edbd513a3bb8309",
+                    "nonce" : "0x48bcdf6d35655016",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0xa1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0a20cc3b2e3979279d789a951cd8e7f75cb10b4d6b13db55868a6239656d88c4688a4a8c32315a720fef85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea0a1ac5b63a91a218d6f05665432927eba5f4a18185adbed7d23f47671d936baaea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0071784e12cf3fa539fffa8cf33d397aa6939b44f0bfde42c0edbd513a3bb83098848bcdf6d35655016f85ff85d800183061a8080830186a08e6001600160016001e060006000f31ca0f0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6a076ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942c0",
                 "transactions" : [
                     {
                         "data" : "0x6001600160016001e060006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa02438112a657c627e246ce6a2597e708c29cbe0e090b8c1a064deedfd2e1d74",
+        "lastblockhash" : "0x1ccf4864d443ab55edaff976dff0a1002ac382f836a74e66500eec78a05f7066",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0.json b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0.json
index 514f34856..907c61d5c 100644
--- a/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0.json
@@ -2,8 +2,8 @@
     "badOpcodes_d9g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -14,9 +14,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x27a1b85e9fc9b3376a43942f84b3a5d3425423edb4b10e056e1e9af657874542",
-                    "mixHash" : "0x7f636cdee1738ff81f8d66389bfca4cf0dfe138505e98669881a475a718df6d4",
-                    "nonce" : "0xc535072e394b26ed",
+                    "hash" : "0x26eb7758c659685c6b51a481ed7f79c2bdca8e46aa296114bf2a86ef0dc0338e",
+                    "mixHash" : "0x409fc9a7100428b9847cfc74e8c81195dfd13df0ba95702220fadfb3b377425c",
+                    "nonce" : "0x8a25360a88fb9366",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -25,7 +25,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a07f636cdee1738ff81f8d66389bfca4cf0dfe138505e98669881a475a718df6d488c535072e394b26edf85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b449a6ccb649d9456d876bdab12ed9d3b1176f23eb28cdbb01e89759d48d0831a087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0409fc9a7100428b9847cfc74e8c81195dfd13df0ba95702220fadfb3b377425c888a25360a88fb9366f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -62,7 +62,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27a1b85e9fc9b3376a43942f84b3a5d3425423edb4b10e056e1e9af657874542",
+        "lastblockhash" : "0x26eb7758c659685c6b51a481ed7f79c2bdca8e46aa296114bf2a86ef0dc0338e",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -93,8 +93,8 @@
     "badOpcodes_d9g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -105,9 +105,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe3f8fca6d8bde0c573741cea5b7d9eb943e9b7ed23c0331701e2f9605a9a6544",
-                    "mixHash" : "0xdb58dbf94c2c187b224df3da0be09e7fee4aac55c36fbb6dc3ad7fc215449f6e",
-                    "nonce" : "0x5e83d365307fc357",
+                    "hash" : "0x13881229f4c176d43f1107e5f63b01530a56015f521333cc5d3f6c2a01dee3d8",
+                    "mixHash" : "0x06288fab05fc733fe3baf2579ce00a79cbc4457670f1b2d34354fe7b42a38213",
+                    "nonce" : "0x526129d125e817f6",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
@@ -116,7 +116,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0db58dbf94c2c187b224df3da0be09e7fee4aac55c36fbb6dc3ad7fc215449f6e885e83d365307fc357f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09cef2004332841a309477988c6fa78eab30712ee21261f80a86ca7f02cd7d256a087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a006288fab05fc733fe3baf2579ce00a79cbc4457670f1b2d34354fe7b42a3821388526129d125e817f6f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -153,7 +153,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3f8fca6d8bde0c573741cea5b7d9eb943e9b7ed23c0331701e2f9605a9a6544",
+        "lastblockhash" : "0x13881229f4c176d43f1107e5f63b01530a56015f521333cc5d3f6c2a01dee3d8",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -191,8 +191,8 @@
     "badOpcodes_d9g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -203,9 +203,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xaa651d4f9958923c268ff15b1af068ac867dc5859841b28ac2658b3be530ec00",
-                    "mixHash" : "0xc7a87d33dc9c7804b3e25a42b684be7f232f012ed6f9ac1d2de7277cd3664c4e",
-                    "nonce" : "0x0fab4a4feb337c0a",
+                    "hash" : "0xf383158d9324e4e1bc29cdb2c3656b4e56e323eeb860f1a6f3b96f89fe58197c",
+                    "mixHash" : "0x32836be526cac8e5b247d61c27f897a82f6a3e630d73c7f39c5da00056717a14",
+                    "nonce" : "0x11d0aac459838f46",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -214,7 +214,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0c7a87d33dc9c7804b3e25a42b684be7f232f012ed6f9ac1d2de7277cd3664c4e880fab4a4feb337c0af85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a032836be526cac8e5b247d61c27f897a82f6a3e630d73c7f39c5da00056717a148811d0aac459838f46f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -251,7 +251,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa651d4f9958923c268ff15b1af068ac867dc5859841b28ac2658b3be530ec00",
+        "lastblockhash" : "0xf383158d9324e4e1bc29cdb2c3656b4e56e323eeb860f1a6f3b96f89fe58197c",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -282,8 +282,8 @@
     "badOpcodes_d9g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -294,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xe7bc4534706f00bd5cf2ef3b15b00028a14123f8cf2401ebc17ee8bbf8a54ce8",
-                    "mixHash" : "0x04583cf5100b982a9c3afa51f5477a6768ba0c07b7a1831fbeba4b9ab06c8b39",
-                    "nonce" : "0xcd7b23fd56d5f3c3",
+                    "hash" : "0x354246637b476e5c01f8b69d76ac6aa6b50a93b85ec910348ddad6f543287369",
+                    "mixHash" : "0xe2a0a4e3b3e094aa2293f3e1b2fb84490dc216ffec3614fc62e88eef2033398e",
+                    "nonce" : "0xdca4eaed8e0d32db",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -305,7 +305,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a004583cf5100b982a9c3afa51f5477a6768ba0c07b7a1831fbeba4b9ab06c8b3988cd7b23fd56d5f3c3f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0e2a0a4e3b3e094aa2293f3e1b2fb84490dc216ffec3614fc62e88eef2033398e88dca4eaed8e0d32dbf85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -342,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7bc4534706f00bd5cf2ef3b15b00028a14123f8cf2401ebc17ee8bbf8a54ce8",
+        "lastblockhash" : "0x354246637b476e5c01f8b69d76ac6aa6b50a93b85ec910348ddad6f543287369",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -373,8 +373,8 @@
     "badOpcodes_d9g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -385,9 +385,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x571493330db5e1ebf5a6ca69b9d60930dae249772bd00d7b62ccdd350c08b3a4",
-                    "mixHash" : "0x0626ac5a8c8bcef08938d787f228b4ee1a58a102ba5a31c4566c23d1932c88a5",
-                    "nonce" : "0x39529dee16e0f266",
+                    "hash" : "0xd852cb91ada23b62ad57ab5c2acff25b508e9b6b57e947c9f39d6e5d36537596",
+                    "mixHash" : "0x981ffcb27bd851808a680b89714ffe9d8e2a91c0ce18a945a2225043dd61246c",
+                    "nonce" : "0x96e2a9ae70cbbe86",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -396,7 +396,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00626ac5a8c8bcef08938d787f228b4ee1a58a102ba5a31c4566c23d1932c88a58839529dee16e0f266f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0981ffcb27bd851808a680b89714ffe9d8e2a91c0ce18a945a2225043dd61246c8896e2a9ae70cbbe86f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -433,7 +433,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x571493330db5e1ebf5a6ca69b9d60930dae249772bd00d7b62ccdd350c08b3a4",
+        "lastblockhash" : "0xd852cb91ada23b62ad57ab5c2acff25b508e9b6b57e947c9f39d6e5d36537596",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -464,8 +464,8 @@
     "badOpcodes_d9g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.70ba1a56.Linux.g++",
-            "source" : "/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
+            "filledwith" : "cpp-1.3.0+commit.e577bb2a.Linux.g++",
+            "source" : "/ethereum/tests/src/GenStateTestAsBcTemp/stBadOpcode/badOpcodes_d9g0v0Filler.json"
         },
         "blocks" : [
             {
@@ -476,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xc98840885c46e250eef6d8054d19b04af20f2514c1114b197473d91bd93b70b1",
-                    "mixHash" : "0x3fac58d3c21c6f037e90cd6e05b5dc8c8152139f0bb8f3d9680c7d82f3b4b40b",
-                    "nonce" : "0x71169bc217ce24f3",
+                    "hash" : "0x6bea60613b02940187316efb0cf2105ca245d6850af3fd5862d8e318b923afb0",
+                    "mixHash" : "0xd6efb17bd5ef14649f8a9adebdad3dfbef0c21c928f7c5e40133e312e89da44f",
+                    "nonce" : "0x9d490e1eb7e478af",
                     "number" : "0x01",
                     "parentHash" : "0x813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020",
                     "receiptTrie" : "0x54d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1",
@@ -487,7 +487,7 @@
                     "transactionsTrie" : "0x87f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898cae",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a03fac58d3c21c6f037e90cd6e05b5dc8c8152139f0bb8f3d9680c7d82f3b4b40b8871169bc217ce24f3f85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
+                "rlp" : "0xf9025df901f8a0813a03e58564185e9a635f602e5f8da3ab602ac12b45b34e03aadbae561a9020a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06428b3140b024b4d06e9aea099f8584f0810b877e2225af4ec95fddc8e4d38eea087f90c1736f4e90c6bbdc935030163cf0769e7d28485f8907d3b991104898caea054d1949a938a3648c080eee5c088a7d39c94d0bdb0285074e7b75ab6f7c98da1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a0d6efb17bd5ef14649f8a9adebdad3dfbef0c21c928f7c5e40133e312e89da44f889d490e1eb7e478aff85ff85d800183061a8080830186a08e60016001600160011f60006000f31ca0ec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4a062df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8c0",
                 "transactions" : [
                     {
                         "data" : "0x60016001600160011f60006000f3",
@@ -524,7 +524,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517f2cdf6adb1a644878c390ffab4e130f1bed4b498ef7ce58c5addd98d61018a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc98840885c46e250eef6d8054d19b04af20f2514c1114b197473d91bd93b70b1",
+        "lastblockhash" : "0x6bea60613b02940187316efb0cf2105ca245d6850af3fd5862d8e318b923afb0",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
index fdbef92c6..fc55e5f6b 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
@@ -46,7 +46,7 @@
         },
         "transaction" : {
             "data" : [
-"0x60016001600160014000006000f3",
+"0x60016001600160015800006000f3",
 "0x60016001600160010c60006000f3",
 "0x60016001600160010d60006000f3",
 "0x60016001600160010e60006000f3",