Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

40 files changed, 1600 insertions, 1880 deletions

diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
index c8e723daa..cea3567b5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
@@ -2,7 +2,7 @@
     "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0xc428946c500cd6298994a51f188b86969cca9359ec56b28c0e0275f10274680e",
-                    "mixHash" : "0xcfe6ed9c8956c9502018745a1c10f9b2e21fb40e38a28889815e71921a876d58",
-                    "nonce" : "0x71570b7404e38cb4",
+                    "hash" : "0x922d67579dd5eb289dc25d121867bf210ed4e116a551d04dfae30170b352358d",
+                    "mixHash" : "0xbdd2698ae83282f0e4ccc6849ae70d54f0dfad609c673ceb7356f9aade082e91",
+                    "nonce" : "0x7a2af024375b4734",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "stateRoot" : "0xc323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0cfe6ed9c8956c9502018745a1c10f9b2e21fb40e38a28889815e71921a876d588871570b7404e38cb4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0bdd2698ae83282f0e4ccc6849ae70d54f0dfad609c673ceb7356f9aade082e91887a2af024375b4734f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc428946c500cd6298994a51f188b86969cca9359ec56b28c0e0275f10274680e",
+        "lastblockhash" : "0x922d67579dd5eb289dc25d121867bf210ed4e116a551d04dfae30170b352358d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x29a2241af6d7c5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "Call1024BalanceTooLow_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x3895f0e9b02235db864cad9887db3f693e2e1144509bfee7316ead0a1f0676f2",
-                    "mixHash" : "0xf0501016b317713194e57eb2ef4b4a35355fc08a6e9ece1cdee48056cb4ebb0d",
-                    "nonce" : "0x4b7d5954ce3b8178",
+                    "hash" : "0x27fd88feae1b52bf9614d3e4aa0ea81273bb34bc23269cfec20bc42462fcff6f",
+                    "mixHash" : "0x8de443b5a353e23735f5a103337cbac68d8be6f2b98cb86ce710b07f6c674cfe",
+                    "nonce" : "0x7c3cee363aeb0c5d",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "stateRoot" : "0x5187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f0501016b317713194e57eb2ef4b4a35355fc08a6e9ece1cdee48056cb4ebb0d884b7d5954ce3b8178f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a08de443b5a353e23735f5a103337cbac68d8be6f2b98cb86ce710b07f6c674cfe887c3cee363aeb0c5df865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3895f0e9b02235db864cad9887db3f693e2e1144509bfee7316ead0a1f0676f2",
+        "lastblockhash" : "0x27fd88feae1b52bf9614d3e4aa0ea81273bb34bc23269cfec20bc42462fcff6f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -215,7 +208,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x29a2241af6d7c5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "Call1024BalanceTooLow_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0xf2530ac24e55b0b3c5b6abd4075585a397fc0376d8cf118cb02aeb38aa728e00",
-                    "mixHash" : "0xe79d12cb56ee017780c5f9a9e813cabd2ca688e9e07c619726bdc0e5f60f8c6a",
-                    "nonce" : "0x78cdf32b59ba435c",
+                    "hash" : "0x96ea48f7a02b4ba9210c170a019e1e6e44c756d2b9f902b7c1362811ca955621",
+                    "mixHash" : "0xc81542728861e734b32c84a8a8899c260da482790e87d459b872e65d88e962e3",
+                    "nonce" : "0x96a007e294d8c9f7",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0e79d12cb56ee017780c5f9a9e813cabd2ca688e9e07c619726bdc0e5f60f8c6a8878cdf32b59ba435cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0c81542728861e734b32c84a8a8899c260da482790e87d459b872e65d88e962e38896a007e294d8c9f7f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2530ac24e55b0b3c5b6abd4075585a397fc0376d8cf118cb02aeb38aa728e00",
+        "lastblockhash" : "0x96ea48f7a02b4ba9210c170a019e1e6e44c756d2b9f902b7c1362811ca955621",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -379,7 +372,7 @@
     "Call1024BalanceTooLow_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x8548086194dd0c6b25364db9aa97025c388f9c6ecae8e61468d8e97e3dbf7555",
-                    "mixHash" : "0xd50861bb44f57f5645f375c31cb46039c66424d60da300cc46d757391e7b35bd",
-                    "nonce" : "0xd654051fcea5fb5e",
+                    "hash" : "0x105db9bfe56b6785d1e4cddf9e981d0919c43a7a762bf062f804ec79b8c3a899",
+                    "mixHash" : "0xf2fa7f49d01a27842a5785efea0fdeb23b7466c69252e811fdda814da6109b27",
+                    "nonce" : "0x9b973f8eba48582c",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0d50861bb44f57f5645f375c31cb46039c66424d60da300cc46d757391e7b35bd88d654051fcea5fb5ef865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f2fa7f49d01a27842a5785efea0fdeb23b7466c69252e811fdda814da6109b27889b973f8eba48582cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8548086194dd0c6b25364db9aa97025c388f9c6ecae8e61468d8e97e3dbf7555",
+        "lastblockhash" : "0x105db9bfe56b6785d1e4cddf9e981d0919c43a7a762bf062f804ec79b8c3a899",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -500,7 +493,7 @@
     "Call1024BalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d788",
-                    "hash" : "0x7adf9cf26c9853d09b4ef2109f14000482383f9cd89cf541742fa57b0bbc513d",
-                    "mixHash" : "0x0a325fa755a87adc5a14974c7e0b26a6c1b5d4d16cb2474289cc490b8fd5768c",
-                    "nonce" : "0xf653c4519202713f",
+                    "hash" : "0xc70859440a18d03a9a459151cc049de31ee8dcab40c2f2079b02fc2cea1d4984",
+                    "mixHash" : "0x7645496e08110f085f558a2b3d38f0e92241903d8f9459ae4871950b664fa4cc",
+                    "nonce" : "0x23f92a2b4ab3b4f8",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a00a325fa755a87adc5a14974c7e0b26a6c1b5d4d16cb2474289cc490b8fd5768c88f653c4519202713ff865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a07645496e08110f085f558a2b3d38f0e92241903d8f9459ae4871950b664fa4cc8823f92a2b4ab3b4f8f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7adf9cf26c9853d09b4ef2109f14000482383f9cd89cf541742fa57b0bbc513d",
+        "lastblockhash" : "0xc70859440a18d03a9a459151cc049de31ee8dcab40c2f2079b02fc2cea1d4984",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -619,7 +612,7 @@
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0xb4b50b39207916f6ba2f8c0813c2091740c6b312a1ab390ce1b8b7338d8484b2",
-                    "mixHash" : "0xde0c92016d4258a2b9f241892c37be6566a333438e69ff7e22f9f3aff279f036",
-                    "nonce" : "0x15f4c67ec52fd530",
+                    "hash" : "0x13217accb6265882c23dfdeb1342344a0c755407f72ea6a60c9ce51fd40cf278",
+                    "mixHash" : "0x61ebde13151411c4d623880c5110cebc67da233785b2f9aca602f9d5f74ba63d",
+                    "nonce" : "0xde1736f6670aa380",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0de0c92016d4258a2b9f241892c37be6566a333438e69ff7e22f9f3aff279f0368815f4c67ec52fd530f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a061ebde13151411c4d623880c5110cebc67da233785b2f9aca602f9d5f74ba63d88de1736f6670aa380f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4b50b39207916f6ba2f8c0813c2091740c6b312a1ab390ce1b8b7338d8484b2",
+        "lastblockhash" : "0x13217accb6265882c23dfdeb1342344a0c755407f72ea6a60c9ce51fd40cf278",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
index c45edd277..f17f28eaa 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "Call1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xa824749eb37a61d08e79750c3496c77a3ccb99f8541bfe82566725e43b3aac17",
-                    "mixHash" : "0xf0dd71e693be6fd730242f7bd463941f0d7e5c6e3901477db4bbc3a96002143e",
-                    "nonce" : "0x832d0a35cc664da5",
+                    "hash" : "0x50ceda3d90a1de3a3309ffa887e857dc5d1af1dda3815c0e8bfed0212d411fff",
+                    "mixHash" : "0x42c6b8713798a0031d49852bd7fa15fe96ac1f732c6a046cc50dab9ca9f5f1fc",
+                    "nonce" : "0x00cdfe4d747c3f91",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "stateRoot" : "0xed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0f0dd71e693be6fd730242f7bd463941f0d7e5c6e3901477db4bbc3a96002143e88832d0a35cc664da5f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a042c6b8713798a0031d49852bd7fa15fe96ac1f732c6a046cc50dab9ca9f5f1fc8800cdfe4d747c3f91f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa824749eb37a61d08e79750c3496c77a3ccb99f8541bfe82566725e43b3aac17",
+        "lastblockhash" : "0x50ceda3d90a1de3a3309ffa887e857dc5d1af1dda3815c0e8bfed0212d411fff",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x29a2241af6668720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -131,7 +124,7 @@
     "Call1024OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -143,18 +136,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x8dd70dec2d0180afee5b673dc4e8ea3c803919dcf7cb7091202f1198b21ca032",
-                    "mixHash" : "0x1853cf9b2eb54bad9c9068e0f451be8870694b73a69e819b9a9aa3fa139957e0",
-                    "nonce" : "0x650452f77a64f545",
+                    "hash" : "0x82dfadf7d0403253fd2a61c42a36dc67bcf43718b94ed968bc8de4ea4dedfcbb",
+                    "mixHash" : "0x7d24827c53c1a5829ca8e93cee17074c8a7afbd44dea86e7b73d798b82476cf4",
+                    "nonce" : "0x0538370d52f324fc",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "stateRoot" : "0xa5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a01853cf9b2eb54bad9c9068e0f451be8870694b73a69e819b9a9aa3fa139957e088650452f77a64f545f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a07d24827c53c1a5829ca8e93cee17074c8a7afbd44dea86e7b73d798b82476cf4880538370d52f324fcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -191,7 +184,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8dd70dec2d0180afee5b673dc4e8ea3c803919dcf7cb7091202f1198b21ca032",
+        "lastblockhash" : "0x82dfadf7d0403253fd2a61c42a36dc67bcf43718b94ed968bc8de4ea4dedfcbb",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -216,7 +209,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x29a2241af6668720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -260,7 +253,7 @@
     "Call1024OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -272,9 +265,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xc63733700531b121dd516008bffcfe2457b5da6af4a41f112e9f05c680ac3663",
-                    "mixHash" : "0xdb6d2202c025d0a950806a632d802dfaf09b8447a639071b1fca0209afed1459",
-                    "nonce" : "0x6d98ff819bdd24be",
+                    "hash" : "0xfc17c4b47b7de5aa5744ef18b08a696c7f19a01d77f3771481cedc33e493563a",
+                    "mixHash" : "0xa0733d8229fb6267dd3c4573d04d737e099882a1b752c1f83afce7fa0fd09236",
+                    "nonce" : "0xd0fff3e8db60592c",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -283,7 +276,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0db6d2202c025d0a950806a632d802dfaf09b8447a639071b1fca0209afed1459886d98ff819bdd24bef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0a0733d8229fb6267dd3c4573d04d737e099882a1b752c1f83afce7fa0fd0923688d0fff3e8db60592cf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -320,7 +313,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc63733700531b121dd516008bffcfe2457b5da6af4a41f112e9f05c680ac3663",
+        "lastblockhash" : "0xfc17c4b47b7de5aa5744ef18b08a696c7f19a01d77f3771481cedc33e493563a",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -382,7 +375,7 @@
     "Call1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -394,9 +387,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x8f7636342cad9670804550336f4ab287a89980fb27137fa2426141cc8d43bd40",
-                    "mixHash" : "0x37161f27027804fb59dcfc1649c02ab461967cadeec76da14c1990746f06c204",
-                    "nonce" : "0x2633c82ae3bb8d13",
+                    "hash" : "0x62c090b5735172a99145e9aefef62c5f1886c9745ed6c027ba4b781170ac7cc4",
+                    "mixHash" : "0xfeb0637d8c203888aad75be29ddf33eeebd5a7804b9dccdb97ee650bd11151e2",
+                    "nonce" : "0xc98d184b64121428",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -405,7 +398,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a037161f27027804fb59dcfc1649c02ab461967cadeec76da14c1990746f06c204882633c82ae3bb8d13f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0feb0637d8c203888aad75be29ddf33eeebd5a7804b9dccdb97ee650bd11151e288c98d184b64121428f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -442,7 +435,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f7636342cad9670804550336f4ab287a89980fb27137fa2426141cc8d43bd40",
+        "lastblockhash" : "0x62c090b5735172a99145e9aefef62c5f1886c9745ed6c027ba4b781170ac7cc4",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -504,7 +497,7 @@
     "Call1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -516,9 +509,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "0x99f1071f416f9c10bb800bfddf60aa5149dff5f95eafbe0860d257f9594604e8",
-                    "mixHash" : "0xd140af099cd05f50b0fdb8ae99e5252ea8729245ce719aba66e003955eb43cf7",
-                    "nonce" : "0x4686b14d3fed291e",
+                    "hash" : "0x4b43c86a1a05167c520f511429312a15a14eb6e2710fbc5be26e807963d8f1c4",
+                    "mixHash" : "0x71b31ebc5491583427279c6fa105449447d0e999590cda95049a3bd623d5050b",
+                    "nonce" : "0x486ac8e7b4679359",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
@@ -527,7 +520,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0d140af099cd05f50b0fdb8ae99e5252ea8729245ce719aba66e003955eb43cf7884686b14d3fed291ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a071b31ebc5491583427279c6fa105449447d0e999590cda95049a3bd623d5050b88486ac8e7b4679359f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -564,7 +557,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99f1071f416f9c10bb800bfddf60aa5149dff5f95eafbe0860d257f9594604e8",
+        "lastblockhash" : "0x4b43c86a1a05167c520f511429312a15a14eb6e2710fbc5be26e807963d8f1c4",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -623,7 +616,7 @@
     "Call1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -635,9 +628,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0x7e747b0f6581435fe50fbc152b22b93ba9905dc525d30870674c5be1f964d633",
-                    "mixHash" : "0x602045a61cfa2fd55708a97411ac999596ef7906db544f051b60c552d586efd3",
-                    "nonce" : "0x064f3c010e6318c5",
+                    "hash" : "0xaa13077589fea1d47bcc4e0404e4d0e302ceb0d299be391c32814e2a8e94175e",
+                    "mixHash" : "0x9f1a20b688c70993aebc177679c73aff7fa1475f37d50e3ffc04be3722aa264c",
+                    "nonce" : "0xc3f7828c85d9a164",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -646,7 +639,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0602045a61cfa2fd55708a97411ac999596ef7906db544f051b60c552d586efd388064f3c010e6318c5f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a09f1a20b688c70993aebc177679c73aff7fa1475f37d50e3ffc04be3722aa264c88c3f7828c85d9a164f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -683,7 +676,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e747b0f6581435fe50fbc152b22b93ba9905dc525d30870674c5be1f964d633",
+        "lastblockhash" : "0xaa13077589fea1d47bcc4e0404e4d0e302ceb0d299be391c32814e2a8e94175e",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
index 62df8ea20..68444e15b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
@@ -2,7 +2,7 @@
     "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x3ab3cbbf095335f5e54f581e21b8be5b01eb60d31803ecaed46b2bceb74d2010",
-                    "mixHash" : "0x0980ffabe445e3ccfeda7a21e1b92b3ea46bfe2a759766f7d661d2af076a2096",
-                    "nonce" : "0x8ca8ec9cdd2e09ab",
+                    "hash" : "0x831e5c5dc75171ce5416dacceadd6e1d5bb9cd99681866d2f632dcb5cbf67ccf",
+                    "mixHash" : "0x3324837daa49e170c20c1e09e9a4742f2e3e60b97d5fa624bc93dd1ab5dc5e71",
+                    "nonce" : "0x97f4dfd332803204",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
-                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
+                    "stateRoot" : "0x946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaeda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a00980ffabe445e3ccfeda7a21e1b92b3ea46bfe2a759766f7d661d2af076a2096888ca8ec9cdd2e09abf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaedaa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a03324837daa49e170c20c1e09e9a4742f2e3e60b97d5fa624bc93dd1ab5dc5e718897f4dfd332803204f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab3cbbf095335f5e54f581e21b8be5b01eb60d31803ecaed46b2bceb74d2010",
+        "lastblockhash" : "0x831e5c5dc75171ce5416dacceadd6e1d5bb9cd99681866d2f632dcb5cbf67ccf",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472179b7",
+                "balance" : "0x29a2241af85979b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "Call1024PreCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x8a1763b1e7b31e48aea5b8005f461e8f472f6db20c2d4d5a76dc6f5c3f526799",
-                    "mixHash" : "0x204187617e3d1e3043e98017caaf40e35eefd6133b4d79d27e9ead0d3b581678",
-                    "nonce" : "0xb7e330a35eb0ee1e",
+                    "hash" : "0x609495e3b1f5f7f1d76ddb7c1377dbe1ea83eeab3cf38708480de817cfee2709",
+                    "mixHash" : "0xcf350fea79302435b6c404e865072b56c95870c0ff98066b2746fa1b0a7c7731",
+                    "nonce" : "0xcd4886d80b5fefd6",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
-                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
+                    "stateRoot" : "0xd2716b9e10282f775117e1d78fe57f5ea04fea81d08a093a08228874aa578961",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0204187617e3d1e3043e98017caaf40e35eefd6133b4d79d27e9ead0d3b58167888b7e330a35eb0ee1ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d2716b9e10282f775117e1d78fe57f5ea04fea81d08a093a08228874aa578961a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0cf350fea79302435b6c404e865072b56c95870c0ff98066b2746fa1b0a7c773188cd4886d80b5fefd6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a1763b1e7b31e48aea5b8005f461e8f472f6db20c2d4d5a76dc6f5c3f526799",
+        "lastblockhash" : "0x609495e3b1f5f7f1d76ddb7c1377dbe1ea83eeab3cf38708480de817cfee2709",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -217,7 +210,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472179b7",
+                "balance" : "0x29a2241af85979b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "Call1024PreCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x37ed0661bbdbfb1646be16a763c01cec234a047e47e0ebb68bdead22041c1192",
-                    "mixHash" : "0x1f43184aacdb4d035a03a6957e53c9118d07112c7a22d1bf47d4f9084061fddb",
-                    "nonce" : "0x6076c73ce95cb86d",
+                    "hash" : "0x54a5789b00075c7a397a14d38a2409ddfae425b9e783fbce0804f2fef4124dcd",
+                    "mixHash" : "0x5cccf3aaa2d3c809b5775745991b0b58d3ddeaf4cb9e7b1e9c0216c8fd8216f6",
+                    "nonce" : "0x5ef3356967b98d8e",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a01f43184aacdb4d035a03a6957e53c9118d07112c7a22d1bf47d4f9084061fddb886076c73ce95cb86df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a05cccf3aaa2d3c809b5775745991b0b58d3ddeaf4cb9e7b1e9c0216c8fd8216f6885ef3356967b98d8ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37ed0661bbdbfb1646be16a763c01cec234a047e47e0ebb68bdead22041c1192",
+        "lastblockhash" : "0x54a5789b00075c7a397a14d38a2409ddfae425b9e783fbce0804f2fef4124dcd",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -385,7 +378,7 @@
     "Call1024PreCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0xe8764d2e77217b490bcbf2264611e1dd04488c3a53d709efd64d73eee08e624a",
-                    "mixHash" : "0x1ca07bb68cfbd4e7e82d1b53e7e9102e4ec7edcc8d075bcc484c4bba62e2e084",
-                    "nonce" : "0x0a29f0284a86e117",
+                    "hash" : "0xde03f22e85dbece9c328ca01cbf32653345d7d7c12242819a36c069c992c21f1",
+                    "mixHash" : "0xe518f19ea6abb3c30da403167d5c3cbfd685d085219d73d13f58dc17fc555c99",
+                    "nonce" : "0x8e19e9f570020bf4",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a01ca07bb68cfbd4e7e82d1b53e7e9102e4ec7edcc8d075bcc484c4bba62e2e084880a29f0284a86e117f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0e518f19ea6abb3c30da403167d5c3cbfd685d085219d73d13f58dc17fc555c99888e19e9f570020bf4f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8764d2e77217b490bcbf2264611e1dd04488c3a53d709efd64d73eee08e624a",
+        "lastblockhash" : "0xde03f22e85dbece9c328ca01cbf32653345d7d7c12242819a36c069c992c21f1",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -508,7 +501,7 @@
     "Call1024PreCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xdab89d272d9d9bbe420b4471f747020df3597f392ea141047ba9ffe91d085f93",
-                    "mixHash" : "0xe03c536cbe4c4c9ce162d5cfe121b86bbc9de48f456be320d667e1cfffdcc4ae",
-                    "nonce" : "0xd25ded4ce32e60f7",
+                    "hash" : "0x67e327b3d705daf884b2fb6ad5ee6784d77612f1fbd75f631c62c61affc9dd0d",
+                    "mixHash" : "0xad4afb489c9d4c087c47668fde416f7342895a844f9a0d8bbf88f216febbce35",
+                    "nonce" : "0x6eaf57db90889453",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0e03c536cbe4c4c9ce162d5cfe121b86bbc9de48f456be320d667e1cfffdcc4ae88d25ded4ce32e60f7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0ad4afb489c9d4c087c47668fde416f7342895a844f9a0d8bbf88f216febbce35886eaf57db90889453f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdab89d272d9d9bbe420b4471f747020df3597f392ea141047ba9ffe91d085f93",
+        "lastblockhash" : "0x67e327b3d705daf884b2fb6ad5ee6784d77612f1fbd75f631c62c61affc9dd0d",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -627,7 +620,7 @@
     "Call1024PreCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -639,9 +632,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018542",
-                    "hash" : "0x539c8e011e74f5f0023e87cdb541e56e221839b6868a365c1f9123265e974d76",
-                    "mixHash" : "0x74f7bc0402bd02650b93b8ffb05e388aaf9477fad599983e884628e11b5c215c",
-                    "nonce" : "0x9b941d72dc7238e8",
+                    "hash" : "0xd3940f4b7747f114f21bbd65212991d21ea8d2e5c80a5f842df7a862976fd01a",
+                    "mixHash" : "0xc5f18a462ea575c042cc0f3b8650fca0bdb1172cb9d2f2404b0144847c99f473",
+                    "nonce" : "0xab6e7bc998a68dd2",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
@@ -650,7 +643,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a074f7bc0402bd02650b93b8ffb05e388aaf9477fad599983e884628e11b5c215c889b941d72dc7238e8f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0c5f18a462ea575c042cc0f3b8650fca0bdb1172cb9d2f2404b0144847c99f47388ab6e7bc998a68dd2f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -687,7 +680,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x539c8e011e74f5f0023e87cdb541e56e221839b6868a365c1f9123265e974d76",
+        "lastblockhash" : "0xd3940f4b7747f114f21bbd65212991d21ea8d2e5c80a5f842df7a862976fd01a",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
index 563f4bfeb..5736c1c2b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "CallLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x349cd0b3d29f8187918a8e247196342f4fb54766f50616778adf2ef8645261b9",
-                    "mixHash" : "0x42e2c4a2f0b43976dfe6f34107c62dbd682a9926bba8fa1f820c7d1d0d8e18e3",
-                    "nonce" : "0x644f118ed6f6aac6",
+                    "hash" : "0xd10d92d08718f61bdf2f311248de91f4109810bb662e8daaf267803694948665",
+                    "mixHash" : "0x86a3dfa228daf7fb6d613460f4e31045f21f1eeb6681168c2396329f8d90e98e",
+                    "nonce" : "0x9132b75ee8a614e0",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
-                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
+                    "stateRoot" : "0xf69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a042e2c4a2f0b43976dfe6f34107c62dbd682a9926bba8fa1f820c7d1d0d8e18e388644f118ed6f6aac6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a086a3dfa228daf7fb6d613460f4e31045f21f1eeb6681168c2396329f8d90e98e889132b75ee8a614e0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x349cd0b3d29f8187918a8e247196342f4fb54766f50616778adf2ef8645261b9",
+        "lastblockhash" : "0xd10d92d08718f61bdf2f311248de91f4109810bb662e8daaf267803694948665",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd722d",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dc8",
+                "balance" : "0x29a2241af62e8dc8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "CallLoseGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x55016f3149d5f84873e7d4f5a3f855de644e64bb8e42b94a831386b8907fced5",
-                    "mixHash" : "0xfe4c4f35e3c78ccc6e404cbf72aa21259c0c6558811ad811b5889cdc0b6b9025",
-                    "nonce" : "0x9ec25ec42edbb29f",
+                    "hash" : "0x3bdbc20836a2cd49f91f38b8502bd5dd4e0b76244fd111ddbf225fee23f5e696",
+                    "mixHash" : "0xdabfaadde766ba3994aed912835d6a2094ddeb0e93214d06cc3fe40ad62d17cf",
+                    "nonce" : "0x2a4cb14fcde320aa",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
-                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
+                    "stateRoot" : "0xf5a12b009e98ef39484d17b142377a737d66ac0321808d6bb6fa5b76e99e318b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0fe4c4f35e3c78ccc6e404cbf72aa21259c0c6558811ad811b5889cdc0b6b9025889ec25ec42edbb29ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f5a12b009e98ef39484d17b142377a737d66ac0321808d6bb6fa5b76e99e318ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0dabfaadde766ba3994aed912835d6a2094ddeb0e93214d06cc3fe40ad62d17cf882a4cb14fcde320aaf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55016f3149d5f84873e7d4f5a3f855de644e64bb8e42b94a831386b8907fced5",
+        "lastblockhash" : "0x3bdbc20836a2cd49f91f38b8502bd5dd4e0b76244fd111ddbf225fee23f5e696",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -215,7 +208,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dc8",
+                "balance" : "0x29a2241af62e8dc8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "CallLoseGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0xd1d2ec1037e0282d8384cb0b29a7605b428b0a89b6d3fc3e48bba7c2a9c4b431",
-                    "mixHash" : "0x96ab5b66adff99fedca4a0f72b865f869d40d173394a89894a366e7cc8907d3c",
-                    "nonce" : "0x55bcd0e19cba5113",
+                    "hash" : "0x6af8ad342e3e823c208516712c29fc95aca1e4886fb2ded0598aeadb10c22a4c",
+                    "mixHash" : "0xd42c469b42f27c976830d10679457c02333bba04a2b5d11187c29f3e26c2948d",
+                    "nonce" : "0x48da7c311f5d90d3",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a096ab5b66adff99fedca4a0f72b865f869d40d173394a89894a366e7cc8907d3c8855bcd0e19cba5113f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0d42c469b42f27c976830d10679457c02333bba04a2b5d11187c29f3e26c2948d8848da7c311f5d90d3f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1d2ec1037e0282d8384cb0b29a7605b428b0a89b6d3fc3e48bba7c2a9c4b431",
+        "lastblockhash" : "0x6af8ad342e3e823c208516712c29fc95aca1e4886fb2ded0598aeadb10c22a4c",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -379,7 +372,7 @@
     "CallLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x3a2e88ad4fac70362c14889dc71d4813c329074c6da294ea5035581af64a52d3",
-                    "mixHash" : "0x0a269d5cc065a8ff42d7b9d2eafd24409a3df3f8ac87b57962b5db86c6edd22e",
-                    "nonce" : "0x76f0e43d13f70fcf",
+                    "hash" : "0x7174f48df74104f822867d42ab06a3824fa24a4f4b055a96dbef9c45ac178759",
+                    "mixHash" : "0xff29ae12ea61342532813e3cd0b91c645a92e99569b9143447a7c54c9806c2b3",
+                    "nonce" : "0x831104cedb5692bc",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a00a269d5cc065a8ff42d7b9d2eafd24409a3df3f8ac87b57962b5db86c6edd22e8876f0e43d13f70fcff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0ff29ae12ea61342532813e3cd0b91c645a92e99569b9143447a7c54c9806c2b388831104cedb5692bcf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a2e88ad4fac70362c14889dc71d4813c329074c6da294ea5035581af64a52d3",
+        "lastblockhash" : "0x7174f48df74104f822867d42ab06a3824fa24a4f4b055a96dbef9c45ac178759",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -500,7 +493,7 @@
     "CallLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x69c9dad8852f20ff2a4de11240bffa04cab7e255a9e1e7d75fe1143ea0dd5bc8",
-                    "mixHash" : "0x5b7de01988386e4daa48435c87aad21620034d33eabf06f4b92e5eb1574644ee",
-                    "nonce" : "0x6ba11c01b93e5683",
+                    "hash" : "0xcc50bd9841fd1155f4701f5ca4d2d422c3ef54ec43e09b1372a92ca781e1ae6e",
+                    "mixHash" : "0x36abd30d6fb13f4545ea4e0533e231ac33cba73a9fdca267d0c6e2a90dd331fd",
+                    "nonce" : "0xd024cbacbe3f4224",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a05b7de01988386e4daa48435c87aad21620034d33eabf06f4b92e5eb1574644ee886ba11c01b93e5683f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a036abd30d6fb13f4545ea4e0533e231ac33cba73a9fdca267d0c6e2a90dd331fd88d024cbacbe3f4224f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69c9dad8852f20ff2a4de11240bffa04cab7e255a9e1e7d75fe1143ea0dd5bc8",
+        "lastblockhash" : "0xcc50bd9841fd1155f4701f5ca4d2d422c3ef54ec43e09b1372a92ca781e1ae6e",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -619,7 +612,7 @@
     "CallLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0xf170b873f8aa5b8c87c3317e7397ee6f76bef36b7aa6e2aac4e12b50d9646b2c",
-                    "mixHash" : "0x1a0d7169a79b5d973050406ff61c2f65885fc69b4524cefaa62bab221ca5e06b",
-                    "nonce" : "0x7bfde7aaa44226c0",
+                    "hash" : "0xa6cc3cbad0123e57e1af094df368678e0c51db165c9f66eb059f5d0349512c32",
+                    "mixHash" : "0xba341466cf6d1b692f6edae85f45036bb708fc3404bc34f2492907f960ee8d69",
+                    "nonce" : "0x2ac188861bf61fba",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a01a0d7169a79b5d973050406ff61c2f65885fc69b4524cefaa62bab221ca5e06b887bfde7aaa44226c0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0ba341466cf6d1b692f6edae85f45036bb708fc3404bc34f2492907f960ee8d69882ac188861bf61fbaf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf170b873f8aa5b8c87c3317e7397ee6f76bef36b7aa6e2aac4e12b50d9646b2c",
+        "lastblockhash" : "0xa6cc3cbad0123e57e1af094df368678e0c51db165c9f66eb059f5d0349512c32",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
index ea1531c84..f416036e2 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
@@ -2,7 +2,7 @@
     "CallRecursiveBombPreCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xb0b1f5c7e3760866f30a48376524710e320b1004250d42389818c1004d5cf531",
-                    "mixHash" : "0x573bfb38a2d54cf4a77af7feeafe1368fc3953377e9051e9ff9067872e9247ce",
-                    "nonce" : "0x77bae860f69fd1f0",
+                    "hash" : "0x6b4c5118f2655f51241433011a3ec8e37bf6ea572b9302de8e343fc6fd6dd8df",
+                    "mixHash" : "0x727544dd8617a12ee8c58a1d48fe73274a2501940c67fee7c570b1a12904989b",
+                    "nonce" : "0x12d47a4cff563fc2",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
-                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
+                    "stateRoot" : "0xfdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0573bfb38a2d54cf4a77af7feeafe1368fc3953377e9051e9ff9067872e9247ce8877bae860f69fd1f0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0727544dd8617a12ee8c58a1d48fe73274a2501940c67fee7c570b1a12904989b8812d47a4cff563fc2f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0b1f5c7e3760866f30a48376524710e320b1004250d42389818c1004d5cf531",
+        "lastblockhash" : "0x6b4c5118f2655f51241433011a3ec8e37bf6ea572b9302de8e343fc6fd6dd8df",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a0b1dd",
+                "balance" : "0x29a2241af6d8b1dd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -139,7 +132,7 @@
     "CallRecursiveBombPreCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -151,18 +144,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xb2d6d7bb9f1bd5f6171ab08b82d95be31c161e22b4919457f4da14f2320d54e2",
-                    "mixHash" : "0x5251c2d8cebbda923d4757f80c91c0a5eac45e240f9a94c83246fc9ae49528fb",
-                    "nonce" : "0x9faf3cbc620c4a27",
+                    "hash" : "0x3677908f12886ec0b49df44c712850cb5097e8c9082edd9915de3acd22543ce7",
+                    "mixHash" : "0x8dd50d34bb3705d21ddaadd2892cbf9c5ed2ce6b406db0ad1f52c2b2c062ccbf",
+                    "nonce" : "0x1c67c74a0fc18321",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
-                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
+                    "stateRoot" : "0xb378392cfb9285a1765ba0bd58131f45d74db7eef65bfc031602414aee438fa2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a05251c2d8cebbda923d4757f80c91c0a5eac45e240f9a94c83246fc9ae49528fb889faf3cbc620c4a27f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b378392cfb9285a1765ba0bd58131f45d74db7eef65bfc031602414aee438fa2a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a08dd50d34bb3705d21ddaadd2892cbf9c5ed2ce6b406db0ad1f52c2b2c062ccbf881c67c74a0fc18321f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -199,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2d6d7bb9f1bd5f6171ab08b82d95be31c161e22b4919457f4da14f2320d54e2",
+        "lastblockhash" : "0x3677908f12886ec0b49df44c712850cb5097e8c9082edd9915de3acd22543ce7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -219,7 +212,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a0b1dd",
+                "balance" : "0x29a2241af6d8b1dd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -276,7 +269,7 @@
     "CallRecursiveBombPreCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -288,9 +281,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xbe493a5a4ff2ceafe0908d959e4dd220a61b23f5c5e72accd18276e1535a4c01",
-                    "mixHash" : "0xcd4b603b87348a44ad499afa9b350e6277eb7e9a3fbea26245f072c293599458",
-                    "nonce" : "0xd528533546a89137",
+                    "hash" : "0x78c0b22f9f4a79e57c05b0d9d1dc4f66373f9d974b7b31f5e3740395df305f07",
+                    "mixHash" : "0xf1a42c4f0019c60090f07d4a24d772586fd9afc2f307a86cd1f29183842387a1",
+                    "nonce" : "0x6d75bec52418fd0f",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
@@ -299,7 +292,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0cd4b603b87348a44ad499afa9b350e6277eb7e9a3fbea26245f072c29359945888d528533546a89137f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0f1a42c4f0019c60090f07d4a24d772586fd9afc2f307a86cd1f29183842387a1886d75bec52418fd0ff867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -336,7 +329,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe493a5a4ff2ceafe0908d959e4dd220a61b23f5c5e72accd18276e1535a4c01",
+        "lastblockhash" : "0x78c0b22f9f4a79e57c05b0d9d1dc4f66373f9d974b7b31f5e3740395df305f07",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -406,7 +399,7 @@
     "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -418,9 +411,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xdf16f036bf91f3e9e2b4e5acbcd478c48a3c906b5514e87c867555e8c2350da1",
-                    "mixHash" : "0x2edd2e368a2c2daec7acfde34f1f373348ac2ce8fcaa349e6889c2deb0893580",
-                    "nonce" : "0xc61573f0257c0fd0",
+                    "hash" : "0xfc634b6c798807cc9c3a513475e6bd05d64806ea4a4fc7bf50d5a5a1668f1ed3",
+                    "mixHash" : "0x1af73fcd4e5e249f6284c63e3c3831a2400317bd843246ca504aafab78921300",
+                    "nonce" : "0x667576e37b8a456a",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
@@ -429,7 +422,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a02edd2e368a2c2daec7acfde34f1f373348ac2ce8fcaa349e6889c2deb089358088c61573f0257c0fd0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a01af73fcd4e5e249f6284c63e3c3831a2400317bd843246ca504aafab7892130088667576e37b8a456af867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -466,7 +459,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf16f036bf91f3e9e2b4e5acbcd478c48a3c906b5514e87c867555e8c2350da1",
+        "lastblockhash" : "0xfc634b6c798807cc9c3a513475e6bd05d64806ea4a4fc7bf50d5a5a1668f1ed3",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -536,7 +529,7 @@
     "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -548,9 +541,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xb6fe70ab80b38e318f1996c6e853b6fb97ccc5a42aa0c914fb0c032064dc2ec1",
-                    "mixHash" : "0x650f6f9eecb3af15c605d8c91b001e90bb97cb0facc1e2688671d0bacb8f2ffd",
-                    "nonce" : "0x32c0a12b29f79ac4",
+                    "hash" : "0x09e0ecee5c6e443130eaa40d694d14341b6ef68cc0f3eeef1a65ca4eefc1248d",
+                    "mixHash" : "0x51b9ccf4e427e9f9bcc805c7b504b4664b29eb1b64b39068e99230b707304270",
+                    "nonce" : "0xfc0fb7f96342e24a",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
@@ -559,7 +552,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0650f6f9eecb3af15c605d8c91b001e90bb97cb0facc1e2688671d0bacb8f2ffd8832c0a12b29f79ac4f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a051b9ccf4e427e9f9bcc805c7b504b4664b29eb1b64b39068e99230b70730427088fc0fb7f96342e24af867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -596,7 +589,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6fe70ab80b38e318f1996c6e853b6fb97ccc5a42aa0c914fb0c032064dc2ec1",
+        "lastblockhash" : "0x09e0ecee5c6e443130eaa40d694d14341b6ef68cc0f3eeef1a65ca4eefc1248d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -655,7 +648,7 @@
     "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -667,9 +660,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa004b5",
-                    "hash" : "0x8cd169a1ed90e531159629bc5712de5df9b971f24fc62c8021f561a333c674c2",
-                    "mixHash" : "0x7451abb044e2993292e132e6d68b3e1a8baffc32bb9afce45f5f8cb49ba60bb7",
-                    "nonce" : "0xc151318bf48d5857",
+                    "hash" : "0x44c0db9d09c97524bbb09721017aa404b2d5b6ee4817704b3530700fc6eaefee",
+                    "mixHash" : "0xf56561c4cbcf6da081c21f4eb57973531c75536fc4da723cde90995da88b1470",
+                    "nonce" : "0x3ea7bf6913530725",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
@@ -678,7 +671,7 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a07451abb044e2993292e132e6d68b3e1a8baffc32bb9afce45f5f8cb49ba60bb788c151318bf48d5857f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0f56561c4cbcf6da081c21f4eb57973531c75536fc4da723cde90995da88b1470883ea7bf6913530725f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -715,7 +708,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cd169a1ed90e531159629bc5712de5df9b971f24fc62c8021f561a333c674c2",
+        "lastblockhash" : "0x44c0db9d09c97524bbb09721017aa404b2d5b6ee4817704b3530700fc6eaefee",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
index ddb7bf3d3..4876aca4e 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "CallcodeLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0xbd13a30663f5e3b48f63fa866a7fb8e6d3eafe465f80ca529a0e7e61c2ca0742",
-                    "mixHash" : "0x89c5244fc46c58c00e4d2805af9f55ba854fa12939d8dc042783fa332200b181",
-                    "nonce" : "0x40eb2021e92086a6",
+                    "hash" : "0xe98bc49a9dd6a9acfb48985c4f5c5c1d5a00422809cf8163e0834327f85c7355",
+                    "mixHash" : "0x180e3acc3840ff6ee3e252614055b3dbdd7a4188335526c9da81a317f2c16c02",
+                    "nonce" : "0x9a899e05d1f630de",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
+                    "stateRoot" : "0xfd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a089c5244fc46c58c00e4d2805af9f55ba854fa12939d8dc042783fa332200b1818840eb2021e92086a6f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0180e3acc3840ff6ee3e252614055b3dbdd7a4188335526c9da81a317f2c16c02889a899e05d1f630def862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd13a30663f5e3b48f63fa866a7fb8e6d3eafe465f80ca529a0e7e61c2ca0742",
+        "lastblockhash" : "0xe98bc49a9dd6a9acfb48985c4f5c5c1d5a00422809cf8163e0834327f85c7355",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
+                "balance" : "0x29a2241af62e8976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -128,7 +121,7 @@
     "CallcodeLoseGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -140,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x241c9cd613f6e72f9a4faeb713e5f672dc65186a5b1561e67298787aa519824d",
-                    "mixHash" : "0x9bab71822ed99ef6b7edbd181c07cb1a9c8a756c5fce2545e451450b994fe313",
-                    "nonce" : "0x526dcc94d77d3b55",
+                    "hash" : "0x4e72e3fc131c65bc64af385aa84ff9c6632ae66622a87a55ef68ffbfb0e2dc4c",
+                    "mixHash" : "0x42b914a10c86ccf0857a58abc5ae29291626845623a7d12bf4d174a66aee124c",
+                    "nonce" : "0x9f8732fe9581ffb1",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
+                    "stateRoot" : "0x7e20d9ae21af47b95bf198d7842abc854de03bf502aeff2822ad330c5fbfa9af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a09bab71822ed99ef6b7edbd181c07cb1a9c8a756c5fce2545e451450b994fe31388526dcc94d77d3b55f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07e20d9ae21af47b95bf198d7842abc854de03bf502aeff2822ad330c5fbfa9afa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a042b914a10c86ccf0857a58abc5ae29291626845623a7d12bf4d174a66aee124c889f8732fe9581ffb1f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -188,7 +181,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x241c9cd613f6e72f9a4faeb713e5f672dc65186a5b1561e67298787aa519824d",
+        "lastblockhash" : "0x4e72e3fc131c65bc64af385aa84ff9c6632ae66622a87a55ef68ffbfb0e2dc4c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -213,7 +206,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
+                "balance" : "0x29a2241af62e8976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -254,7 +247,7 @@
     "CallcodeLoseGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -266,9 +259,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0xedaea9fd8afef01dc9d1c958486255ea3b573270b8b499b8cc456bb1e87ff59e",
-                    "mixHash" : "0x6b51bce8c64309be95bc3a12646e5614c8169f490e1a2e08d3bc34ba4a76fc24",
-                    "nonce" : "0xb2580ddd4cb2f75d",
+                    "hash" : "0x930e6f2014f3a19ed02531f221c377a3bdffed0ead60c16e6bf9f48257554415",
+                    "mixHash" : "0x821c7781f1eafac3c2dea5bf6ecf96f583fafc897d8ecb59102f54b01bac3bca",
+                    "nonce" : "0x77f9f65fa624dddd",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -277,7 +270,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a06b51bce8c64309be95bc3a12646e5614c8169f490e1a2e08d3bc34ba4a76fc2488b2580ddd4cb2f75df862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0821c7781f1eafac3c2dea5bf6ecf96f583fafc897d8ecb59102f54b01bac3bca8877f9f65fa624ddddf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -314,7 +307,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xedaea9fd8afef01dc9d1c958486255ea3b573270b8b499b8cc456bb1e87ff59e",
+        "lastblockhash" : "0x930e6f2014f3a19ed02531f221c377a3bdffed0ead60c16e6bf9f48257554415",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -373,7 +366,7 @@
     "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -385,9 +378,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x814a1f2680ee0b45a09477811b96399020e9b128727fc9a647d6752d44763f14",
-                    "mixHash" : "0x999880b2e6ee8d1db385cf17830b13dfadeac40a5a1e97c6c9f5c940bc65bbd7",
-                    "nonce" : "0x5caf7761066d67dd",
+                    "hash" : "0x93cb02d2b92bf34ccfc9e8b0342d53547f4e91265a49c10f5d22295f6d1d70c8",
+                    "mixHash" : "0x2103f64283d5c01ebf3d6a6d092719f626cb87c35ce6fbd3746c17bc01274489",
+                    "nonce" : "0x5e97527fe3d6365c",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -396,7 +389,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0999880b2e6ee8d1db385cf17830b13dfadeac40a5a1e97c6c9f5c940bc65bbd7885caf7761066d67ddf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a02103f64283d5c01ebf3d6a6d092719f626cb87c35ce6fbd3746c17bc01274489885e97527fe3d6365cf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -433,7 +426,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x814a1f2680ee0b45a09477811b96399020e9b128727fc9a647d6752d44763f14",
+        "lastblockhash" : "0x93cb02d2b92bf34ccfc9e8b0342d53547f4e91265a49c10f5d22295f6d1d70c8",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -492,7 +485,7 @@
     "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -504,9 +497,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x6d26f55656dbce0af16210c218963e8a4ddf1a2da230b73d1af48033c1e62293",
-                    "mixHash" : "0x08338d04dc8e5843e441570b2eb14898bfdb3e70bc97c04c1dcad5cc642f722a",
-                    "nonce" : "0xbad9982e02b5a156",
+                    "hash" : "0x81b751b7be0df4a79e2085f802ad0fb6608626adfe21cbf3477fcd584337fe73",
+                    "mixHash" : "0x97d27b29e7aeaf5242e6906596f6de8c605d74e5a23b2f8c6fb760d3600aff60",
+                    "nonce" : "0x4ce2fb7161b81dbb",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -515,7 +508,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a008338d04dc8e5843e441570b2eb14898bfdb3e70bc97c04c1dcad5cc642f722a88bad9982e02b5a156f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a097d27b29e7aeaf5242e6906596f6de8c605d74e5a23b2f8c6fb760d3600aff60884ce2fb7161b81dbbf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -552,7 +545,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d26f55656dbce0af16210c218963e8a4ddf1a2da230b73d1af48033c1e62293",
+        "lastblockhash" : "0x81b751b7be0df4a79e2085f802ad0fb6608626adfe21cbf3477fcd584337fe73",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -611,7 +604,7 @@
     "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -623,9 +616,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0x6e5d211d6d3c6088055ec9f2344e03a46bb2dde2d2f0b2b8c5b9f48d2fb70f54",
-                    "mixHash" : "0x00ec71c7ef91963698b5fe33f55c5e702c299101aaf4f5d38e1bdc7c3d0827cb",
-                    "nonce" : "0x047ad2d9e7793cec",
+                    "hash" : "0x08009071bc3ea1a502deb6e461772382e10e81ddc5077639533dd1bcfa0e13c8",
+                    "mixHash" : "0xbef88486d3f7b6d543192cd88c06344abb928fb788544f38aee37f49d157d744",
+                    "nonce" : "0xc746234af8e57537",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -634,7 +627,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a000ec71c7ef91963698b5fe33f55c5e702c299101aaf4f5d38e1bdc7c3d0827cb88047ad2d9e7793cecf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0bef88486d3f7b6d543192cd88c06344abb928fb788544f38aee37f49d157d74488c746234af8e57537f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -671,7 +664,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e5d211d6d3c6088055ec9f2344e03a46bb2dde2d2f0b2b8c5b9f48d2fb70f54",
+        "lastblockhash" : "0x08009071bc3ea1a502deb6e461772382e10e81ddc5077639533dd1bcfa0e13c8",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
index a574b51c8..804865e19 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "Delegatecall1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xc206c46b16c5641ba5ec41bd8319421af8b32b9ae4c5ee47c37f7b16ed8afebd",
-                    "mixHash" : "0x338f89a1832a33db003ee806ee0920c4f735bb3b98186441b38ffe3c58a27424",
-                    "nonce" : "0x5dca50dff78639ca",
+                    "hash" : "0x012b2c71b657d5b1acfa5c4f69a56309298de9a1d318d64278d516480a3bc0a9",
+                    "mixHash" : "0x4aca36c10bedde96f25a84bdb26d80879ee94ac963b3275e1d3d12d6756fba7e",
+                    "nonce" : "0x5cdbcfa0ff0a1a7c",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "stateRoot" : "0xed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0338f89a1832a33db003ee806ee0920c4f735bb3b98186441b38ffe3c58a27424885dca50dff78639caf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a04aca36c10bedde96f25a84bdb26d80879ee94ac963b3275e1d3d12d6756fba7e885cdbcfa0ff0a1a7cf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc206c46b16c5641ba5ec41bd8319421af8b32b9ae4c5ee47c37f7b16ed8afebd",
+        "lastblockhash" : "0x012b2c71b657d5b1acfa5c4f69a56309298de9a1d318d64278d516480a3bc0a9",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x29a2241af6668720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -131,7 +124,7 @@
     "Delegatecall1024OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -143,18 +136,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x8e9851c6804d252ebd14260452882ccf64c8f3b8a21dc8f2ea3841605958af23",
-                    "mixHash" : "0x2468ae120ddc1116257e71fb989ff7af7502b9f4c4fbb44f7338ce16ad7dba6e",
-                    "nonce" : "0x53d49ff4d017625b",
+                    "hash" : "0xe46fc2d4c46dd1dc25c75df8c66af0e4c2d35309906223c395ff409773d17336",
+                    "mixHash" : "0xb1f1a324d2a76dbadf85c8e4b80ba8cffcbd309e3a2eaa5ad3d1821cf495fe1a",
+                    "nonce" : "0xd78c9c0f826ca76e",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "stateRoot" : "0xa5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a02468ae120ddc1116257e71fb989ff7af7502b9f4c4fbb44f7338ce16ad7dba6e8853d49ff4d017625bf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5f2fccb584183d2beb54afc46ee0a58a4817c526dcddf3b72e65900c5bfdc33a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0b1f1a324d2a76dbadf85c8e4b80ba8cffcbd309e3a2eaa5ad3d1821cf495fe1a88d78c9c0f826ca76ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -191,7 +184,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e9851c6804d252ebd14260452882ccf64c8f3b8a21dc8f2ea3841605958af23",
+        "lastblockhash" : "0xe46fc2d4c46dd1dc25c75df8c66af0e4c2d35309906223c395ff409773d17336",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -216,7 +209,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x29a2241af6668720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -260,7 +253,7 @@
     "Delegatecall1024OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -272,9 +265,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xf7e859c34a9e69b1e77b339def7f21549c2329c681028aa80a8291f5a83097fe",
-                    "mixHash" : "0x962607f9c6cd6cf3da1da6f1503382ba6b15a902475ba2f475d8e305f2fe0f01",
-                    "nonce" : "0x10834d21bf95e6ea",
+                    "hash" : "0x3f7adba987136d8726aeca94f9020549976fb1fb41969e0dfbb5a789aff64a17",
+                    "mixHash" : "0xe2956ff4b5b5f749a52de67e6b35fc0fb1cccd422dd03644452ad496a814a706",
+                    "nonce" : "0x127c593d8c9eac61",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -283,7 +276,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0962607f9c6cd6cf3da1da6f1503382ba6b15a902475ba2f475d8e305f2fe0f018810834d21bf95e6eaf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0e2956ff4b5b5f749a52de67e6b35fc0fb1cccd422dd03644452ad496a814a70688127c593d8c9eac61f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -320,7 +313,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7e859c34a9e69b1e77b339def7f21549c2329c681028aa80a8291f5a83097fe",
+        "lastblockhash" : "0x3f7adba987136d8726aeca94f9020549976fb1fb41969e0dfbb5a789aff64a17",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -382,7 +375,7 @@
     "Delegatecall1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -394,9 +387,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x4b360be01ba025ae8a0f0a4137a884e63f580128f7c394ff4b7c98d7240cac8d",
-                    "mixHash" : "0x948a7d42017c3b957add65a5285abc16eb3c9ce4143c0ebdefb50d4ece35b14f",
-                    "nonce" : "0xef75091e2dfee64a",
+                    "hash" : "0x3e6ee79bc5f666499f07c1e5e9f4b48f68443c83330734f48b6a3574a98e5f8e",
+                    "mixHash" : "0xfb475e0a7438242fdc5762f3abbe342cb67c9389e41a1f75e9cb933e49f3451b",
+                    "nonce" : "0xc979506bc53803bd",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -405,7 +398,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0948a7d42017c3b957add65a5285abc16eb3c9ce4143c0ebdefb50d4ece35b14f88ef75091e2dfee64af862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0fb475e0a7438242fdc5762f3abbe342cb67c9389e41a1f75e9cb933e49f3451b88c979506bc53803bdf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -442,7 +435,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b360be01ba025ae8a0f0a4137a884e63f580128f7c394ff4b7c98d7240cac8d",
+        "lastblockhash" : "0x3e6ee79bc5f666499f07c1e5e9f4b48f68443c83330734f48b6a3574a98e5f8e",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -504,7 +497,7 @@
     "Delegatecall1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -516,9 +509,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefe17a",
-                    "hash" : "0x5a2fcd480f4034cb12575604c8705477a4471102151dd9c7d6770b34df4040b7",
-                    "mixHash" : "0xbd0e6c473297b45d093cd738ce4d269ee959e11af88dd1b0571821bb3c46c062",
-                    "nonce" : "0x093133d52bb1e685",
+                    "hash" : "0x4e4cb1e7c9d79be2b7b86ddc649bde9411cdbe88f92b658f6a58aa33180fa287",
+                    "mixHash" : "0x047302ad9c67dc1e73b945d3207b566de02291195dfcaca82391b20935f9321b",
+                    "nonce" : "0x2007774685b7eb37",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
@@ -527,7 +520,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0bd0e6c473297b45d093cd738ce4d269ee959e11af88dd1b0571821bb3c46c06288093133d52bb1e685f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0047302ad9c67dc1e73b945d3207b566de02291195dfcaca82391b20935f9321b882007774685b7eb37f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -564,7 +557,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a2fcd480f4034cb12575604c8705477a4471102151dd9c7d6770b34df4040b7",
+        "lastblockhash" : "0x4e4cb1e7c9d79be2b7b86ddc649bde9411cdbe88f92b658f6a58aa33180fa287",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -623,7 +616,7 @@
     "Delegatecall1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -635,9 +628,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0x5313f5281f33c5d5490fe1fc982447b8d67abd494b92aceaa0e53d74ae86df58",
-                    "mixHash" : "0xf1b2f105724917dd60baa74a50a3fb16832fb9e2dbef5d67f9ccf5dbec45b016",
-                    "nonce" : "0x9732c050da3d0cb1",
+                    "hash" : "0xefdebe2120552d394aa011ffa21ee1b384376df65306f51979a02ac1301f5fd9",
+                    "mixHash" : "0x786394a6b6e379e7c49ec83e229c513cfafc569a9c5228b76412fef0af3c5a06",
+                    "nonce" : "0x407e1e9a207c4563",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -646,7 +639,7 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0f1b2f105724917dd60baa74a50a3fb16832fb9e2dbef5d67f9ccf5dbec45b016889732c050da3d0cb1f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0786394a6b6e379e7c49ec83e229c513cfafc569a9c5228b76412fef0af3c5a0688407e1e9a207c4563f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -683,7 +676,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5313f5281f33c5d5490fe1fc982447b8d67abd494b92aceaa0e53d74ae86df58",
+        "lastblockhash" : "0xefdebe2120552d394aa011ffa21ee1b384376df65306f51979a02ac1301f5fd9",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
index 115a288e6..e4d5aa6b9 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
@@ -2,7 +2,7 @@
     "Delegatecall1024_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x0d5597ed47e13f0d06c63e331ae63705f4e479b88c39d0db6301007398312051",
-                    "mixHash" : "0x64a17b8504f326a65348d18c087ee553f524d24428a88f08e2dec901bd18768f",
-                    "nonce" : "0x2aeb20ccb8369ab2",
+                    "hash" : "0x13f5ec6f7efefd4687fb2464cf4b9470629a102876d250fc151f05bde755b69e",
+                    "mixHash" : "0x69b1b882deb28d78b55457823619e957b1c895a61c5f5cac2f78644ec2d18696",
+                    "nonce" : "0x7604e160d7ac0b3e",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "stateRoot" : "0xc323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a064a17b8504f326a65348d18c087ee553f524d24428a88f08e2dec901bd18768f882aeb20ccb8369ab2f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a069b1b882deb28d78b55457823619e957b1c895a61c5f5cac2f78644ec2d18696887604e160d7ac0b3ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d5597ed47e13f0d06c63e331ae63705f4e479b88c39d0db6301007398312051",
+        "lastblockhash" : "0x13f5ec6f7efefd4687fb2464cf4b9470629a102876d250fc151f05bde755b69e",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -87,7 +80,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x29a2241af6d7c5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "Delegatecall1024_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0xc11f8e689944be8a9d1461d3d74327214b259ca67bcec2d5865c53641bd2a95e",
-                    "mixHash" : "0x1d8d93be29c3810a59b38d76183946fb1b2473114bd85de2cbc4ce7957726e97",
-                    "nonce" : "0x13c591e71d59ac8d",
+                    "hash" : "0xca7afed13869209684a5874fa5c9d8d9ae9a6830e97938de3e0a016ce500722f",
+                    "mixHash" : "0x318d7e5bf78fffc50053af3c7fb13bf2851aab5f793e4e3a9d979738fc8eefb8",
+                    "nonce" : "0xb8440c3606c20ccf",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "stateRoot" : "0x5187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a01d8d93be29c3810a59b38d76183946fb1b2473114bd85de2cbc4ce7957726e978813c591e71d59ac8df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba05187d67bcc898514462b2f8637b92e1f2cd1f79e43600fd2ce785a05aea5c184a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0318d7e5bf78fffc50053af3c7fb13bf2851aab5f793e4e3a9d979738fc8eefb888b8440c3606c20ccff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc11f8e689944be8a9d1461d3d74327214b259ca67bcec2d5865c53641bd2a95e",
+        "lastblockhash" : "0xca7afed13869209684a5874fa5c9d8d9ae9a6830e97938de3e0a016ce500722f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -215,7 +208,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x29a2241af6d7c5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "Delegatecall1024_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x67bba0b0ab63c0b84266021ab857d70c81af5ad518ab489ed4a69bedb854ef64",
-                    "mixHash" : "0xd5d693d3a5646da3905c37051c3ee7293bbd6b794f747983680f9df17d677c5e",
-                    "nonce" : "0x40b616161e1aa184",
+                    "hash" : "0x740693e9ac3b222c08d54042fe3fb0f6c35f49eac0d565c5fcf56d810ccad467",
+                    "mixHash" : "0x11baf6ab866c1a0e129fe61ab81482181ed3a98e4aed95e8db56c4161e4aa835",
+                    "nonce" : "0x0c0def66b9c7fcc5",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0d5d693d3a5646da3905c37051c3ee7293bbd6b794f747983680f9df17d677c5e8840b616161e1aa184f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a011baf6ab866c1a0e129fe61ab81482181ed3a98e4aed95e8db56c4161e4aa835880c0def66b9c7fcc5f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67bba0b0ab63c0b84266021ab857d70c81af5ad518ab489ed4a69bedb854ef64",
+        "lastblockhash" : "0x740693e9ac3b222c08d54042fe3fb0f6c35f49eac0d565c5fcf56d810ccad467",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -379,7 +372,7 @@
     "Delegatecall1024_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0xef3396269f33539a1be4104f9ece0e6ec0cc680aa222cbfdcf24c5f767f399f6",
-                    "mixHash" : "0x9a845b19ed0c4a93277432ffb2913d9270a925c43c093118223420a2b5b2ddcf",
-                    "nonce" : "0x0923e58392112526",
+                    "hash" : "0x15406c4c7032d791223a69dd7e9966560472a95d1b40346fa3ce414ea90224a9",
+                    "mixHash" : "0x38dd09087ddc025203ddd5d814f94bdf17fd78998b067bee6d1519b952c9d740",
+                    "nonce" : "0xe7cde3bf1648465b",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09a845b19ed0c4a93277432ffb2913d9270a925c43c093118223420a2b5b2ddcf880923e58392112526f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a038dd09087ddc025203ddd5d814f94bdf17fd78998b067bee6d1519b952c9d74088e7cde3bf1648465bf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef3396269f33539a1be4104f9ece0e6ec0cc680aa222cbfdcf24c5f767f399f6",
+        "lastblockhash" : "0x15406c4c7032d791223a69dd7e9966560472a95d1b40346fa3ce414ea90224a9",
         "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -500,7 +493,7 @@
     "Delegatecall1024_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xb0d3fd654d9a0189cbd623a58acb82047b6127b132abe6d26e480ff0dd0a2f07",
-                    "mixHash" : "0xb5df99f7b478ff1eced9745d469a9b631d45fd32dececb9eec4bc51fc398738c",
-                    "nonce" : "0x9440f95a3aeb8585",
+                    "hash" : "0x3c6ddaad3b3bc91bf16f194aaefe392a15572f0dae3784bc1073ea7e18fa2e6d",
+                    "mixHash" : "0x3fc83412c86a23e8123bfe84a776652630cc3c6a36c6e6d1de2a6ddf8ad32104",
+                    "nonce" : "0xf7202b9b428afac0",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0b5df99f7b478ff1eced9745d469a9b631d45fd32dececb9eec4bc51fc398738c889440f95a3aeb8585f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a03fc83412c86a23e8123bfe84a776652630cc3c6a36c6e6d1de2a6ddf8ad3210488f7202b9b428afac0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0d3fd654d9a0189cbd623a58acb82047b6127b132abe6d26e480ff0dd0a2f07",
+        "lastblockhash" : "0x3c6ddaad3b3bc91bf16f194aaefe392a15572f0dae3784bc1073ea7e18fa2e6d",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -619,7 +612,7 @@
     "Delegatecall1024_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x0b62350b620ab99e86d33d5772d9f68cd9c7a39477ad045c9945f0d389cd0636",
-                    "mixHash" : "0x21ffa093f4a1ca25a687f346f839c3e8da94fbfa119f8a0c3b054d136606578a",
-                    "nonce" : "0x2299128adef4692c",
+                    "hash" : "0x774fddf99384a447cd2bdefc6e528be01684f61fc1b0f861cd8bf8d25ecc903f",
+                    "mixHash" : "0xe2c8aaef549544ebffefadbcc58f0023ef899d29dda66613cedf8a982e8a826b",
+                    "nonce" : "0x13652c119a1b340c",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a021ffa093f4a1ca25a687f346f839c3e8da94fbfa119f8a0c3b054d136606578a882299128adef4692cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0e2c8aaef549544ebffefadbcc58f0023ef899d29dda66613cedf8a982e8a826b8813652c119a1b340cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b62350b620ab99e86d33d5772d9f68cd9c7a39477ad045c9945f0d389cd0636",
+        "lastblockhash" : "0x774fddf99384a447cd2bdefc6e528be01684f61fc1b0f861cd8bf8d25ecc903f",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
index c91f78171..aaed47743 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x38825d99ac44f994fd4d84217816d2efcd39b624ff5ccc11f9cead7d6d340d7d",
-                    "mixHash" : "0x53c8710e13d8e13253805e15e2d85a218c5579313d2a5d48220bea098b898be4",
-                    "nonce" : "0x2e3d59edd2d43e9e",
+                    "hash" : "0x9ba8088d4b5d50cd0f2746051bceb99c93a24779c02c97453ac14fb1cc563f54",
+                    "mixHash" : "0x99aeac3a7c74a880afd0f367e09348e2ced247472ba0056b621a175696e1ad07",
+                    "nonce" : "0x3b89d4a949a4a5bb",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0x0212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a053c8710e13d8e13253805e15e2d85a218c5579313d2a5d48220bea098b898be4882e3d59edd2d43e9ec0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a099aeac3a7c74a880afd0f367e09348e2ced247472ba0056b621a175696e1ad07883b89d4a949a4a5bbc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38825d99ac44f994fd4d84217816d2efcd39b624ff5ccc11f9cead7d6d340d7d",
+        "lastblockhash" : "0x9ba8088d4b5d50cd0f2746051bceb99c93a24779c02c97453ac14fb1cc563f54",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5de81344a06e4f29584810756d85f6802aed62780a39c43ac51f09656ec2b46e",
-                    "mixHash" : "0x67cd7466a871675fee06182f7b6dec1fe5e55af128fb6afdb29713e892e53fb9",
-                    "nonce" : "0x3d9163ebfd704a46",
+                    "hash" : "0xcc55670936e7a7615b9275e4b7c70af74647919b56e8cf7386beaf1030c9b071",
+                    "mixHash" : "0x797c9e3a16ec4d18f8ffb2f4e3c5b1d4dc2deb1d59dd1404ededa9282b344e5b",
+                    "nonce" : "0x5098af518af92b71",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0x7c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a067cd7466a871675fee06182f7b6dec1fe5e55af128fb6afdb29713e892e53fb9883d9163ebfd704a46c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0797c9e3a16ec4d18f8ffb2f4e3c5b1d4dc2deb1d59dd1404ededa9282b344e5b885098af518af92b71c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5de81344a06e4f29584810756d85f6802aed62780a39c43ac51f09656ec2b46e",
+        "lastblockhash" : "0xcc55670936e7a7615b9275e4b7c70af74647919b56e8cf7386beaf1030c9b071",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x081d2c6a3bd56e19bc139623477de773cd4b4197775d611ce77ba9eafb7b8dac",
-                    "mixHash" : "0x8a621a5241c3864777e54fb97384465358569b8555867035a83ded6df4480adc",
-                    "nonce" : "0x84f23cff8c765585",
+                    "hash" : "0x17ac6503d472231dcf97480217ef732e058facc63f6512283ec0fcea04ab5794",
+                    "mixHash" : "0xa3a349f680474fcd4862633a3a98115196052997ff2e5aa1ee9f3280bd34533f",
+                    "nonce" : "0xe13498401c8bfcd6",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08a621a5241c3864777e54fb97384465358569b8555867035a83ded6df4480adc8884f23cff8c765585c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3a349f680474fcd4862633a3a98115196052997ff2e5aa1ee9f3280bd34533f88e13498401c8bfcd6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x081d2c6a3bd56e19bc139623477de773cd4b4197775d611ce77ba9eafb7b8dac",
+        "lastblockhash" : "0x17ac6503d472231dcf97480217ef732e058facc63f6512283ec0fcea04ab5794",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x89dce96269e89e6ea2e69952633db17d818c6f3c5d469544e4979acb3cd79e4b",
-                    "mixHash" : "0x920e52884602d60f8ef1d9a74e3b93d299ccfd7fabba37217cf9b32671be7df8",
-                    "nonce" : "0xe0b052e30412cd26",
+                    "hash" : "0x6da0077545d50fdfa266a58ce911f95ee4f65a26f702e5754b4663c5d17808af",
+                    "mixHash" : "0xfd70caf0347157fbe8585fc95506fc26e35aff79fa2eb2a2f63982518a101fc7",
+                    "nonce" : "0x005aebb29c2f07dc",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0920e52884602d60f8ef1d9a74e3b93d299ccfd7fabba37217cf9b32671be7df888e0b052e30412cd26c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fd70caf0347157fbe8585fc95506fc26e35aff79fa2eb2a2f63982518a101fc788005aebb29c2f07dcc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89dce96269e89e6ea2e69952633db17d818c6f3c5d469544e4979acb3cd79e4b",
+        "lastblockhash" : "0x6da0077545d50fdfa266a58ce911f95ee4f65a26f702e5754b4663c5d17808af",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8ed742d9277f914e065c241f20e2659e112e3f1811be5c88beee0cf1d4806deb",
-                    "mixHash" : "0xc55a69566fbcb1a68f0215a15fc1eb12b724b42e68ca24c9cbacbcfb7d4aff70",
-                    "nonce" : "0x75ea5f3fb33939ee",
+                    "hash" : "0x4d9c638cae00e25655a2eb805bddf222067a3632813734462c22dfcc45f05092",
+                    "mixHash" : "0x9ac9e0fa890172b3b25789924d8a1761e49ed5379a1264f025bbd56f63bd1dec",
+                    "nonce" : "0xa913434d2844c0aa",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c55a69566fbcb1a68f0215a15fc1eb12b724b42e68ca24c9cbacbcfb7d4aff708875ea5f3fb33939eec0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09ac9e0fa890172b3b25789924d8a1761e49ed5379a1264f025bbd56f63bd1dec88a913434d2844c0aac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ed742d9277f914e065c241f20e2659e112e3f1811be5c88beee0cf1d4806deb",
+        "lastblockhash" : "0x4d9c638cae00e25655a2eb805bddf222067a3632813734462c22dfcc45f05092",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xec8252cbb972ed163b310c2a57be6d47bb03872403c6d2e872d4b9d7c12719fd",
-                    "mixHash" : "0xaf1b14ba348ddb159058e2a5d8fe13d9ccf8d2383cf2b1bee383b51e55249c78",
-                    "nonce" : "0xa0a7889eb67dde3c",
+                    "hash" : "0x38adda092ab2e0a114bb788751f4fcf00ec027f87378aa7380d98ad351866718",
+                    "mixHash" : "0x1b46a77775bfa5d00a69df2b9949222f4b570c131594bfe3ab4ae79dc19a5a07",
+                    "nonce" : "0x50fc592280b579ac",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0af1b14ba348ddb159058e2a5d8fe13d9ccf8d2383cf2b1bee383b51e55249c7888a0a7889eb67dde3cc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01b46a77775bfa5d00a69df2b9949222f4b570c131594bfe3ab4ae79dc19a5a078850fc592280b579acc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec8252cbb972ed163b310c2a57be6d47bb03872403c6d2e872d4b9d7c12719fd",
+        "lastblockhash" : "0x38adda092ab2e0a114bb788751f4fcf00ec027f87378aa7380d98ad351866718",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
index 17deb6ca7..033856c73 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput1_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xf097186db787fd2f66e876fe30de8a8566822a67f2976d375b6eca07dde0087f",
-                    "mixHash" : "0x1ee308ed2ecbe8228b9d2e5afcba65a791ef9b872d589cdfc5e28757dfed9f21",
-                    "nonce" : "0xa42949ecc77a55a4",
+                    "hash" : "0x6936f309a21f587b9bc7e0292216989a023fd052eb46fed4438c5bbce7df0563",
+                    "mixHash" : "0xf8cdce5ddf24df781e8a241c380a05181ff20aa805ced4afe687a613a9d0ac77",
+                    "nonce" : "0x68c22bcb78044f33",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
+                    "stateRoot" : "0x970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a01ee308ed2ecbe8228b9d2e5afcba65a791ef9b872d589cdfc5e28757dfed9f2188a42949ecc77a55a4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f8cdce5ddf24df781e8a241c380a05181ff20aa805ced4afe687a613a9d0ac778868c22bcb78044f33f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf097186db787fd2f66e876fe30de8a8566822a67f2976d375b6eca07dde0087f",
+        "lastblockhash" : "0x6936f309a21f587b9bc7e0292216989a023fd052eb46fed4438c5bbce7df0563",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput1_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x2fe6610b9bfe97d5b159b078c9b1b66bac77e51e74e9e96a14f59db60ae77071",
-                    "mixHash" : "0xb14d18b1667b0d320c1cff43c5a5f1620dc24da1b5b0c74a66d5747668e2984b",
-                    "nonce" : "0xcd82d8ae56bb045f",
+                    "hash" : "0xec5cf5f9052d64fc376405a5a182612a3a0ced4596936368cb024fc29b27ec4d",
+                    "mixHash" : "0xb1a67456b805b2faf679b638e3a53eb8ac07aadddc57e100fcf6702fb2e9431f",
+                    "nonce" : "0x06d1d4b332e179e6",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
+                    "stateRoot" : "0xc3d10c3cfee9ca71e73af93e153aabdfc4ac50abedce9356e490ad3ee08ab141",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b14d18b1667b0d320c1cff43c5a5f1620dc24da1b5b0c74a66d5747668e2984b88cd82d8ae56bb045ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c3d10c3cfee9ca71e73af93e153aabdfc4ac50abedce9356e490ad3ee08ab141a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b1a67456b805b2faf679b638e3a53eb8ac07aadddc57e100fcf6702fb2e9431f8806d1d4b332e179e6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fe6610b9bfe97d5b159b078c9b1b66bac77e51e74e9e96a14f59db60ae77071",
+        "lastblockhash" : "0xec5cf5f9052d64fc376405a5a182612a3a0ced4596936368cb024fc29b27ec4d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput1_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x718f783ea384d03aacde66f5d47e9e0abaa551fe8c10fabd6ca0f45bd9784342",
-                    "mixHash" : "0x853db1b80857f015d8e4b08f2d0aa8b488e6dab9664399793ec1c3cac7926ac2",
-                    "nonce" : "0x5b828cda7600cebb",
+                    "hash" : "0xa172748de14d450d87b97e4fb947ee15aff8a8f037a1adf110ce678f77402aaf",
+                    "mixHash" : "0xfd47f4af7bc8cbc68105255d90771bffdffa143c013c0c1679fa60fde6fef7e7",
+                    "nonce" : "0x40b2c6663a10dce8",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0853db1b80857f015d8e4b08f2d0aa8b488e6dab9664399793ec1c3cac7926ac2885b828cda7600cebbf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0fd47f4af7bc8cbc68105255d90771bffdffa143c013c0c1679fa60fde6fef7e78840b2c6663a10dce8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x718f783ea384d03aacde66f5d47e9e0abaa551fe8c10fabd6ca0f45bd9784342",
+        "lastblockhash" : "0xa172748de14d450d87b97e4fb947ee15aff8a8f037a1adf110ce678f77402aaf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput1_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x586982b9457b2780d50f2aaddbe1c9f8cfbeb03fed78f604d4e5b29503863aeb",
-                    "mixHash" : "0xe021ff3f2b40c54191c8aa432f7709f5cecded3bc0591ff1a226926502a0aaa1",
-                    "nonce" : "0x883a9243aec6df85",
+                    "hash" : "0x989b810ebdd0f8cd8a513733428af4a5ef09cd997c5d6b3dbc0fbeac6cbf5793",
+                    "mixHash" : "0x3bb34b5b4d277da62fb508b0efc77b42c67a818e9022b92bb225655c53a9cd53",
+                    "nonce" : "0x731a9807322b9cd6",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e021ff3f2b40c54191c8aa432f7709f5cecded3bc0591ff1a226926502a0aaa188883a9243aec6df85f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03bb34b5b4d277da62fb508b0efc77b42c67a818e9022b92bb225655c53a9cd5388731a9807322b9cd6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x586982b9457b2780d50f2aaddbe1c9f8cfbeb03fed78f604d4e5b29503863aeb",
+        "lastblockhash" : "0x989b810ebdd0f8cd8a513733428af4a5ef09cd997c5d6b3dbc0fbeac6cbf5793",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput1_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x45d50010fd70f6214d90eb0654f09161ff341f911e8ed72424e96eb97311eaea",
-                    "mixHash" : "0x8cb08dbacf9f27f5410b4a4eb5310694ad68b7f304cac503df91a4e98544ff98",
-                    "nonce" : "0x495a4aa46e1bd93b",
+                    "hash" : "0xca785a632bb3e9d1bac2af3c0d5239320016112a7e07e4f61e7f93b0c07724ce",
+                    "mixHash" : "0xcf2ab154e873a3bc17a9f50a3ca32b49e749291b0c83ee722fcfb2d884c9b8f6",
+                    "nonce" : "0xab920231602c799d",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a08cb08dbacf9f27f5410b4a4eb5310694ad68b7f304cac503df91a4e98544ff9888495a4aa46e1bd93bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0cf2ab154e873a3bc17a9f50a3ca32b49e749291b0c83ee722fcfb2d884c9b8f688ab920231602c799df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45d50010fd70f6214d90eb0654f09161ff341f911e8ed72424e96eb97311eaea",
+        "lastblockhash" : "0xca785a632bb3e9d1bac2af3c0d5239320016112a7e07e4f61e7f93b0c07724ce",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput1_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x0f86859775c056c58a710ae4b092da8ca223ee2eb45477ed983b596a2d1013f1",
-                    "mixHash" : "0x63f3d1e1854b18285450a27bef75712396d28bd3d911e9a4285b9f96da97fb92",
-                    "nonce" : "0xd53aad9930e25dc4",
+                    "hash" : "0x8a73db13bc390e718633c66bb0aa3b52c506d8827a7fa3402ee0658a32279526",
+                    "mixHash" : "0x2c48c28ae06a43e7c42880c0db7cc3fe3f72a8eae36df1b599ad4b57e9f81ebb",
+                    "nonce" : "0xc1a88acf8835ff56",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a063f3d1e1854b18285450a27bef75712396d28bd3d911e9a4285b9f96da97fb9288d53aad9930e25dc4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a02c48c28ae06a43e7c42880c0db7cc3fe3f72a8eae36df1b599ad4b57e9f81ebb88c1a88acf8835ff56f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f86859775c056c58a710ae4b092da8ca223ee2eb45477ed983b596a2d1013f1",
+        "lastblockhash" : "0x8a73db13bc390e718633c66bb0aa3b52c506d8827a7fa3402ee0658a32279526",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
index 7e857e893..dba671314 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xabbba1788af1c293d764fb06abcc8fa9ecdbad7132cd9b3467b6dc08dca8826b",
-                    "mixHash" : "0x45e075c142a831e31ab340b2ec1efb72f791953f1210341787a8cf61c506e41f",
-                    "nonce" : "0x732949412e109733",
+                    "hash" : "0xc8fb7f37c094eb9520c1a09232498bd1917501ef5102f6cea27f783e9d19d8f1",
+                    "mixHash" : "0x2aa8cd9d4be0b62a669b93a78b1745ba2803cce0c7dcf66f4e504718e70965c7",
+                    "nonce" : "0x704a096a6f9ff2d0",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0x45318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a045e075c142a831e31ab340b2ec1efb72f791953f1210341787a8cf61c506e41f88732949412e109733c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02aa8cd9d4be0b62a669b93a78b1745ba2803cce0c7dcf66f4e504718e70965c788704a096a6f9ff2d0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabbba1788af1c293d764fb06abcc8fa9ecdbad7132cd9b3467b6dc08dca8826b",
+        "lastblockhash" : "0xc8fb7f37c094eb9520c1a09232498bd1917501ef5102f6cea27f783e9d19d8f1",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x539a07da41059d2a3dbd6d5b9a3d30d0664eb671a62caaf7e14bc4e4f7588965",
-                    "mixHash" : "0xecd2bbf672a718ecfe3dbbac8150d9f5a0fc2e2dd62980e017c09e52b68362e1",
-                    "nonce" : "0xbf88ea60daae74e7",
+                    "hash" : "0x76713315254c5142de95a6e5d05d189060145a057685fddfd66429289fe49115",
+                    "mixHash" : "0xd399c00e438a66b92c41f42375fb71566b25308e06d9161f498a83336c4fe735",
+                    "nonce" : "0x17f6e27e5e8cbec2",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0xecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecd2bbf672a718ecfe3dbbac8150d9f5a0fc2e2dd62980e017c09e52b68362e188bf88ea60daae74e7c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d399c00e438a66b92c41f42375fb71566b25308e06d9161f498a83336c4fe7358817f6e27e5e8cbec2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x539a07da41059d2a3dbd6d5b9a3d30d0664eb671a62caaf7e14bc4e4f7588965",
+        "lastblockhash" : "0x76713315254c5142de95a6e5d05d189060145a057685fddfd66429289fe49115",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3f7a3192b736a50dab427a516cb9eae99c122729a2f06161e23de8b882676e06",
-                    "mixHash" : "0x9aa8dd22738c6d1c84f25cd02b6d01eb9a57267ac34f7f80d4ab86b87cbb33a1",
-                    "nonce" : "0x93cf93ae32a1b753",
+                    "hash" : "0xd83550a9fce98b5697b2ec419df55b65d71c06a4bae8433f552dea214402765e",
+                    "mixHash" : "0x248e88dd898b0c812362ea2efc031f75910c921bd06bf25dca2cbd8c8410662b",
+                    "nonce" : "0xebb6d35fcc82b887",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09aa8dd22738c6d1c84f25cd02b6d01eb9a57267ac34f7f80d4ab86b87cbb33a18893cf93ae32a1b753c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0248e88dd898b0c812362ea2efc031f75910c921bd06bf25dca2cbd8c8410662b88ebb6d35fcc82b887c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f7a3192b736a50dab427a516cb9eae99c122729a2f06161e23de8b882676e06",
+        "lastblockhash" : "0xd83550a9fce98b5697b2ec419df55b65d71c06a4bae8433f552dea214402765e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb66927c07b200a6c49ef50068d96676ab7a336da6e10a082f3d6536f82578c0b",
-                    "mixHash" : "0x3b38e3266ad0f194e9f2e0a4e796fb27d7073cd2e818fcecf5f8c4c169920761",
-                    "nonce" : "0x910da296b4f04bf5",
+                    "hash" : "0x651f9a2822eaf284d491e0e7fc4dfb105f0ef72ca6472aded03370cdaf88b43d",
+                    "mixHash" : "0x210893d6d79f72c2610945a093279078f67f191a63b3fe12199a372cf98bc9ad",
+                    "nonce" : "0xac1750867b9aa0e6",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03b38e3266ad0f194e9f2e0a4e796fb27d7073cd2e818fcecf5f8c4c16992076188910da296b4f04bf5c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0210893d6d79f72c2610945a093279078f67f191a63b3fe12199a372cf98bc9ad88ac1750867b9aa0e6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb66927c07b200a6c49ef50068d96676ab7a336da6e10a082f3d6536f82578c0b",
+        "lastblockhash" : "0x651f9a2822eaf284d491e0e7fc4dfb105f0ef72ca6472aded03370cdaf88b43d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4b014c01d112b5699ca0e2d37d318871bbe32e2ff002c1dd9ac538b4d4b1df1a",
-                    "mixHash" : "0xd8a538579fc65154e61f91e47286acefbd610ff5d81bd43b11c32e55eade7cde",
-                    "nonce" : "0xe3b664d2b7ef700c",
+                    "hash" : "0x1aaa4805cc832989f7525d3e7749520d98f1184d7a88d092e59f2f2102d41302",
+                    "mixHash" : "0x044367115ecceb1878ff898e82de5f610390a3766cd16bd7cb6aaa6895afd2eb",
+                    "nonce" : "0x59601933f7e04134",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d8a538579fc65154e61f91e47286acefbd610ff5d81bd43b11c32e55eade7cde88e3b664d2b7ef700cc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0044367115ecceb1878ff898e82de5f610390a3766cd16bd7cb6aaa6895afd2eb8859601933f7e04134c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b014c01d112b5699ca0e2d37d318871bbe32e2ff002c1dd9ac538b4d4b1df1a",
+        "lastblockhash" : "0x1aaa4805cc832989f7525d3e7749520d98f1184d7a88d092e59f2f2102d41302",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x93f13ab42f56fb965f71a1f11b4f2d915fbd2de68fba420eb0fd3e34331a7256",
-                    "mixHash" : "0x569e8c7e7d5bb4cd1725a7e401ebb424bb4e5e7cb5fb52502282f8dfdb95fe2b",
-                    "nonce" : "0x89f3861974d11926",
+                    "hash" : "0x1a4753bbc340d6a408ee6a51a968d35857a1a0ed3ce021bd679c95cbc18bfc64",
+                    "mixHash" : "0xca9771efff4059eeb123a7ff67c8fb68ae2a0ad53fffa02cb0dc5e4d379d9acd",
+                    "nonce" : "0xbf93dce97fe4a79c",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0569e8c7e7d5bb4cd1725a7e401ebb424bb4e5e7cb5fb52502282f8dfdb95fe2b8889f3861974d11926c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ca9771efff4059eeb123a7ff67c8fb68ae2a0ad53fffa02cb0dc5e4d379d9acd88bf93dce97fe4a79cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93f13ab42f56fb965f71a1f11b4f2d915fbd2de68fba420eb0fd3e34331a7256",
+        "lastblockhash" : "0x1a4753bbc340d6a408ee6a51a968d35857a1a0ed3ce021bd679c95cbc18bfc64",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
index dc357b5e0..609069167 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x22acbad3344d473396c6026f9630038c2239bc4332e1638494956c574e6b4c2f",
-                    "mixHash" : "0x9e9e157ee71cb8bb3b75d87f497f34cc993f125eb652d88bcfad8c9d7c96e503",
-                    "nonce" : "0xeb93c85af190929b",
+                    "hash" : "0x4dd5e4e13074d272eab12bcf0141956b665b6a45312834970929b0516d761402",
+                    "mixHash" : "0x7570a0b3e50213fd2b8e7917b50e510ba927572b98d10e64e2ef237be47bd500",
+                    "nonce" : "0x1ec0e6ff0a1f8e52",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
+                    "stateRoot" : "0x90ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a09e9e157ee71cb8bb3b75d87f497f34cc993f125eb652d88bcfad8c9d7c96e50388eb93c85af190929bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a07570a0b3e50213fd2b8e7917b50e510ba927572b98d10e64e2ef237be47bd500881ec0e6ff0a1f8e52f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22acbad3344d473396c6026f9630038c2239bc4332e1638494956c574e6b4c2f",
+        "lastblockhash" : "0x4dd5e4e13074d272eab12bcf0141956b665b6a45312834970929b0516d761402",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput2_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x031dc91b52b7ee036e4a3be9611fe437deaccfa29629c87f57c87b585a313972",
-                    "mixHash" : "0x672691f1d9cba02867912bd52d9e0b6d55cb1319b09cecf66b4011d182d8c056",
-                    "nonce" : "0x1e6ac53c3b109728",
+                    "hash" : "0xab0eae9a6230a393625ff5dfbd837b21c2df52c3d95ee5e3391356b7409440c3",
+                    "mixHash" : "0x88170b644f37166e7b7e5c3b4aabfbc1971e93a590c574619ea248c03b4c6b8b",
+                    "nonce" : "0xc5ce1711aeafe3a0",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
+                    "stateRoot" : "0xc4d36a03fb511900721aea6396c11d41f38d97ad41f66c9dbb4d618ac834ddfd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0672691f1d9cba02867912bd52d9e0b6d55cb1319b09cecf66b4011d182d8c056881e6ac53c3b109728f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d36a03fb511900721aea6396c11d41f38d97ad41f66c9dbb4d618ac834ddfda0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a088170b644f37166e7b7e5c3b4aabfbc1971e93a590c574619ea248c03b4c6b8b88c5ce1711aeafe3a0f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x031dc91b52b7ee036e4a3be9611fe437deaccfa29629c87f57c87b585a313972",
+        "lastblockhash" : "0xab0eae9a6230a393625ff5dfbd837b21c2df52c3d95ee5e3391356b7409440c3",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput2_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x90966334904025cf7fd0b97bc5dabfd9e776b080803dcf73c03da556ae91c9fa",
-                    "mixHash" : "0x3d29edc02be6a5296561f6ab7e1e2060650c4250f6d2c02472854766b3f39a3d",
-                    "nonce" : "0xd8f7ccfb4e0b712a",
+                    "hash" : "0xa71b5f1271907d3a54ebc67cffdac8f4141634dbd0b02ab298fb617292f8defd",
+                    "mixHash" : "0x42fbace9a755e2053f4362059e1c32a32267db03f50a11218ab2caaded7fd11f",
+                    "nonce" : "0x9c0288f0be83a6f8",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03d29edc02be6a5296561f6ab7e1e2060650c4250f6d2c02472854766b3f39a3d88d8f7ccfb4e0b712af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a042fbace9a755e2053f4362059e1c32a32267db03f50a11218ab2caaded7fd11f889c0288f0be83a6f8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90966334904025cf7fd0b97bc5dabfd9e776b080803dcf73c03da556ae91c9fa",
+        "lastblockhash" : "0xa71b5f1271907d3a54ebc67cffdac8f4141634dbd0b02ab298fb617292f8defd",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x2a033eb9b1493ba77a61f4a56d45319278c32a78cefa96ed8c9f5e7c95e4f96d",
-                    "mixHash" : "0x73f45d584f998e93d0b36ec5b1d86fd0b8d63fde2c755e9bcd5114a09f8c2283",
-                    "nonce" : "0xe003f2777bf60cf1",
+                    "hash" : "0x8bf31d4dab38d0afdca3e07a401e1107ceff6313a0fd85726931be218bdcb310",
+                    "mixHash" : "0x2b651eb201686304ff1ee1f5b63ccfb692001c928343b1a8e399b267296f4b7f",
+                    "nonce" : "0xee43b28f104c7158",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a073f45d584f998e93d0b36ec5b1d86fd0b8d63fde2c755e9bcd5114a09f8c228388e003f2777bf60cf1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a02b651eb201686304ff1ee1f5b63ccfb692001c928343b1a8e399b267296f4b7f88ee43b28f104c7158f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a033eb9b1493ba77a61f4a56d45319278c32a78cefa96ed8c9f5e7c95e4f96d",
+        "lastblockhash" : "0x8bf31d4dab38d0afdca3e07a401e1107ceff6313a0fd85726931be218bdcb310",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x807aa9b9194ac3d30b63a6739ac813b4cf59f4f244c6887db633eaafdd8e61d1",
-                    "mixHash" : "0xf1788c83f623642255e24781fbd24a8763850efe4e6c639697a9f7d643436911",
-                    "nonce" : "0x1eb6e230dbda6180",
+                    "hash" : "0x07a6ec4f2695f2fc10ad4c9c13d41338b10c774ac0e83337539b049a330f2aaf",
+                    "mixHash" : "0xd31ee3fe77f2934b32c0177af386f74b5dd4d76399973e3e70e26ad03d9cdf5c",
+                    "nonce" : "0x9fc33c602279ebc8",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0f1788c83f623642255e24781fbd24a8763850efe4e6c639697a9f7d643436911881eb6e230dbda6180f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0d31ee3fe77f2934b32c0177af386f74b5dd4d76399973e3e70e26ad03d9cdf5c889fc33c602279ebc8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x807aa9b9194ac3d30b63a6739ac813b4cf59f4f244c6887db633eaafdd8e61d1",
+        "lastblockhash" : "0x07a6ec4f2695f2fc10ad4c9c13d41338b10c774ac0e83337539b049a330f2aaf",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput2_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x264b2b9fdb1a784492ef441f8ced8c7b8c9a68b4d0c63c58aef58a5d2f3956a8",
-                    "mixHash" : "0x5c0e8b1cda4681cc612456355c74ad854b05f89b7f22d71b26221ea978cf7809",
-                    "nonce" : "0x37db760412141b02",
+                    "hash" : "0x670a350e872809191012f910e9716748a964e6c940e25884122b8f71f7a462db",
+                    "mixHash" : "0x1174472bb656eb259801393c616a7e12eee1d324f762226f251f9bfd60955a91",
+                    "nonce" : "0x03c6a8e708c69e45",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a05c0e8b1cda4681cc612456355c74ad854b05f89b7f22d71b26221ea978cf78098837db760412141b02f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a01174472bb656eb259801393c616a7e12eee1d324f762226f251f9bfd60955a918803c6a8e708c69e45f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x264b2b9fdb1a784492ef441f8ced8c7b8c9a68b4d0c63c58aef58a5d2f3956a8",
+        "lastblockhash" : "0x670a350e872809191012f910e9716748a964e6c940e25884122b8f71f7a462db",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
index 5d3eb6570..4f1b68da7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5798a6dc2e279980d0ad065540377555671c17ea053e664a00bf3ef5a6b1ca28",
-                    "mixHash" : "0x3b4538969b7e847ff7a461643c9cdf501a27ed63c4957d9224c1795f299661ef",
-                    "nonce" : "0xd52530526fde1f0e",
+                    "hash" : "0x4fc2e8dfee126733a6b8a8d6386fa94a56639f3cd8a77a20a4c38afa011a7b22",
+                    "mixHash" : "0x8129a1a1e2e279f9f319095b5d08601b7febf31b9f8596c9491b9c62b725174a",
+                    "nonce" : "0x61718d827837fb01",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
+                    "stateRoot" : "0xb92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03b4538969b7e847ff7a461643c9cdf501a27ed63c4957d9224c1795f299661ef88d52530526fde1f0ec0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08129a1a1e2e279f9f319095b5d08601b7febf31b9f8596c9491b9c62b725174a8861718d827837fb01c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5798a6dc2e279980d0ad065540377555671c17ea053e664a00bf3ef5a6b1ca28",
+        "lastblockhash" : "0x4fc2e8dfee126733a6b8a8d6386fa94a56639f3cd8a77a20a4c38afa011a7b22",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput3Fail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd927475b458a6337e0d96a1fab86aeaa69c5067a2faa37acb0c7f821cc5514cb",
-                    "mixHash" : "0xef12a8e9e882740783295b0918a2278c3024e0f189981e792354e45e3c162bea",
-                    "nonce" : "0xce8c4a8fbcebf532",
+                    "hash" : "0xdec8968820945e72e32b01ca62e0f98d38d81e7f6a401cf7d80a400d4c80ce5e",
+                    "mixHash" : "0xa5e7b63fdbe04f2c1c286d5bd4bdd2f9dace1d42986006c589461f7ca2cabe47",
+                    "nonce" : "0x15ea1de8078cb401",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
+                    "stateRoot" : "0xdc6bd80463d9cfd6d07e5ccf8aa4366a032bc0c2b64a1486afcb7de21c4d2edd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ef12a8e9e882740783295b0918a2278c3024e0f189981e792354e45e3c162bea88ce8c4a8fbcebf532c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6bd80463d9cfd6d07e5ccf8aa4366a032bc0c2b64a1486afcb7de21c4d2edda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a5e7b63fdbe04f2c1c286d5bd4bdd2f9dace1d42986006c589461f7ca2cabe478815ea1de8078cb401c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd927475b458a6337e0d96a1fab86aeaa69c5067a2faa37acb0c7f821cc5514cb",
+        "lastblockhash" : "0xdec8968820945e72e32b01ca62e0f98d38d81e7f6a401cf7d80a400d4c80ce5e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput3Fail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6443af23e7b7b12e2c85b276a5f68941fb1fe8896c2e04776010978a6b624c09",
-                    "mixHash" : "0x7a4e8872bb7389e65d15e3a285dd212c8f3c20e27cb26e9c4478c21555734416",
-                    "nonce" : "0xe52b37c5ec0daf93",
+                    "hash" : "0x5e022a13e8fe3d2ef3acb364e3145d7ae7024be960f4f641c578ab2087a00add",
+                    "mixHash" : "0xeac02871e6576fb280de9e0b4dddac92d14064e7b18a12697042f456356d0f84",
+                    "nonce" : "0x4b832a9d775d2e04",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07a4e8872bb7389e65d15e3a285dd212c8f3c20e27cb26e9c4478c2155573441688e52b37c5ec0daf93c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0eac02871e6576fb280de9e0b4dddac92d14064e7b18a12697042f456356d0f84884b832a9d775d2e04c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6443af23e7b7b12e2c85b276a5f68941fb1fe8896c2e04776010978a6b624c09",
+        "lastblockhash" : "0x5e022a13e8fe3d2ef3acb364e3145d7ae7024be960f4f641c578ab2087a00add",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x07fa76ff7725019b942f6802a1978d053093f3497ebbbcdf5d760f5530446d47",
-                    "mixHash" : "0x3a8b942530046ca74d7f5cbd5f049c8203ce4a8c8563e94bc66d3e2092fd7db7",
-                    "nonce" : "0x16734135e5b8b601",
+                    "hash" : "0x9d8476a0d0b3d4f682efb6ee2b056f6c65048a11b31b58bfc0aa9cbcc5c61fe7",
+                    "mixHash" : "0x4d7ab73b247e88d2a69f1b94aa9d012fe9feeb6bd0dd4c1a7da78a8454dd86fd",
+                    "nonce" : "0xf86d8883cbe71cc0",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03a8b942530046ca74d7f5cbd5f049c8203ce4a8c8563e94bc66d3e2092fd7db78816734135e5b8b601c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04d7ab73b247e88d2a69f1b94aa9d012fe9feeb6bd0dd4c1a7da78a8454dd86fd88f86d8883cbe71cc0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07fa76ff7725019b942f6802a1978d053093f3497ebbbcdf5d760f5530446d47",
+        "lastblockhash" : "0x9d8476a0d0b3d4f682efb6ee2b056f6c65048a11b31b58bfc0aa9cbcc5c61fe7",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5af5f9908e7a41b21e4ed73eb8cb5b6ca93ac8e3c67b6f0debfb11dfd13aa479",
-                    "mixHash" : "0x864625b0dba31b8b5c2ecad4c1862e733a998f6396d08ec0f3f87745f6e0a91d",
-                    "nonce" : "0x41d84f6e4457f5d2",
+                    "hash" : "0xb6bb7fcde47597dcfd779a7a9efba054b2ae7769528ed0ce5948e55835ea3027",
+                    "mixHash" : "0x356afd782569f4cef9be41a85ad3fad2f1e7a58bb8b16c268730451056227f8e",
+                    "nonce" : "0x035ac58be8ad6557",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0864625b0dba31b8b5c2ecad4c1862e733a998f6396d08ec0f3f87745f6e0a91d8841d84f6e4457f5d2c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0356afd782569f4cef9be41a85ad3fad2f1e7a58bb8b16c268730451056227f8e88035ac58be8ad6557c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5af5f9908e7a41b21e4ed73eb8cb5b6ca93ac8e3c67b6f0debfb11dfd13aa479",
+        "lastblockhash" : "0xb6bb7fcde47597dcfd779a7a9efba054b2ae7769528ed0ce5948e55835ea3027",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4fc5482585542b49c88863e9d6fa5f46021484e11555e8ff36ccff5ce3055b73",
-                    "mixHash" : "0x55e286bda948d305147ef5ebee672132d3bed5da9f27527e4da510f23ef6f838",
-                    "nonce" : "0x55f38acd4d802694",
+                    "hash" : "0xda16b17cb6fd4adc57a7119021731d336921fb3101348034819e0165639a0cdf",
+                    "mixHash" : "0x63a40001e99fdd60ef02f6a346140d139af834d82b6c149a205d41c97070189a",
+                    "nonce" : "0xf6aa9be7af40f6db",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a055e286bda948d305147ef5ebee672132d3bed5da9f27527e4da510f23ef6f8388855f38acd4d802694c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a063a40001e99fdd60ef02f6a346140d139af834d82b6c149a205d41c97070189a88f6aa9be7af40f6dbc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4fc5482585542b49c88863e9d6fa5f46021484e11555e8ff36ccff5ce3055b73",
+        "lastblockhash" : "0xda16b17cb6fd4adc57a7119021731d336921fb3101348034819e0165639a0cdf",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
index 6590fae58..2d846f9b7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput3Fail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xf358bda94a1f0f53b9be6a9fbd81a7131420f1206eae633678af697919d3a6f9",
-                    "mixHash" : "0xc126eec89284aa1ed4c1e1c7207704d943c81f1b0263925701b31787c85e1fc2",
-                    "nonce" : "0x4fc4200b567968ae",
+                    "hash" : "0x6ed4d5acebf8ffc97ced15cdd94d3537d3c1e25b590f419d89566a7439d011ea",
+                    "mixHash" : "0x27fd632f8aa08029d1ec8b51f69fe8a793f0c203036f8aad422a4a90c299205d",
+                    "nonce" : "0x2cfc2241a781c37e",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
+                    "stateRoot" : "0x88e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0c126eec89284aa1ed4c1e1c7207704d943c81f1b0263925701b31787c85e1fc2884fc4200b567968aef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a027fd632f8aa08029d1ec8b51f69fe8a793f0c203036f8aad422a4a90c299205d882cfc2241a781c37ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf358bda94a1f0f53b9be6a9fbd81a7131420f1206eae633678af697919d3a6f9",
+        "lastblockhash" : "0x6ed4d5acebf8ffc97ced15cdd94d3537d3c1e25b590f419d89566a7439d011ea",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput3Fail_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x5b8aed605adbbd4cd3f7db2da6d482557f94e3dedc486ce7f4ed5dc6cc27951b",
-                    "mixHash" : "0x5353e86b09cd859d5f7157fe4111080c02975e1774a36b65dc58a0ae7c4be69a",
-                    "nonce" : "0xa46386fde095684d",
+                    "hash" : "0x2d6ce45f87455a522981079e0303babbffcd6923e89192ee0ce5077300176d07",
+                    "mixHash" : "0xc768714f541e1d43505d00e9cd9be39a2702c13969aa9f984438e47105d13d1f",
+                    "nonce" : "0x28701d81ae654819",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
+                    "stateRoot" : "0x8c70458f06bcbe701d445d4937a19130c96cf8ed320e1ee5069b4bad49f86ea5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a05353e86b09cd859d5f7157fe4111080c02975e1774a36b65dc58a0ae7c4be69a88a46386fde095684df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c70458f06bcbe701d445d4937a19130c96cf8ed320e1ee5069b4bad49f86ea5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0c768714f541e1d43505d00e9cd9be39a2702c13969aa9f984438e47105d13d1f8828701d81ae654819f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b8aed605adbbd4cd3f7db2da6d482557f94e3dedc486ce7f4ed5dc6cc27951b",
+        "lastblockhash" : "0x2d6ce45f87455a522981079e0303babbffcd6923e89192ee0ce5077300176d07",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput3Fail_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xabcf65cbe2b64cd4a469cae4002a21ccb69fb8ee2da409bc57ed8b1a8c9af32a",
-                    "mixHash" : "0xafaca1e0e6b08d5211acf8370bb8ff60ff13b5558dfd0bea918f426f01b0023d",
-                    "nonce" : "0xd405752f0060dc9f",
+                    "hash" : "0x367e157cfa42e9a3c4a6ef45613241df49e2de24d79fe23c316f280d5aa13e9e",
+                    "mixHash" : "0xfc7d7fe9da3c7585d414faee860c88f21ca98fe3fc22beb6f58d46dbd71ef7d7",
+                    "nonce" : "0x94abe757f8c85e0b",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0afaca1e0e6b08d5211acf8370bb8ff60ff13b5558dfd0bea918f426f01b0023d88d405752f0060dc9ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0fc7d7fe9da3c7585d414faee860c88f21ca98fe3fc22beb6f58d46dbd71ef7d78894abe757f8c85e0bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xabcf65cbe2b64cd4a469cae4002a21ccb69fb8ee2da409bc57ed8b1a8c9af32a",
+        "lastblockhash" : "0x367e157cfa42e9a3c4a6ef45613241df49e2de24d79fe23c316f280d5aa13e9e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput3Fail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x5e86fcb3f81d9bcb69bc1d7211a923f25c2b5cbf08fe4f5994e3a8c4f7f7d455",
-                    "mixHash" : "0xcdf0c5b12b2aae1b5b37e5ede87bedcc544308c205e2eaad264604ccc3a11c36",
-                    "nonce" : "0x02b892e9be3e2a2c",
+                    "hash" : "0xd9ad7d396653c592142b403ddd4c0a1093256d4b7f25e85208c0eacf0862c7a8",
+                    "mixHash" : "0x12e49d863d74a3748e5ddc8f8cef4f694dd49f1318782a039236b1b2a14e7f0c",
+                    "nonce" : "0xc8acb08743cc578d",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cdf0c5b12b2aae1b5b37e5ede87bedcc544308c205e2eaad264604ccc3a11c368802b892e9be3e2a2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a012e49d863d74a3748e5ddc8f8cef4f694dd49f1318782a039236b1b2a14e7f0c88c8acb08743cc578df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e86fcb3f81d9bcb69bc1d7211a923f25c2b5cbf08fe4f5994e3a8c4f7f7d455",
+        "lastblockhash" : "0xd9ad7d396653c592142b403ddd4c0a1093256d4b7f25e85208c0eacf0862c7a8",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput3Fail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0xeb8a4b3605bcbfc91bc376514e678164700a5e2df38a4c1d9d7a45fdd9529df5",
-                    "mixHash" : "0xaf3d2e9cd67b5f58950bdff16b93b5523e69e036d34657b5bc04dc465bd1bca0",
-                    "nonce" : "0x36a9b65b33f4e965",
+                    "hash" : "0xf1a98bff9294751a41f7ecc43b282a6af622af4c8c282b2cb3813001a28f0a43",
+                    "mixHash" : "0x928f490a07248bf4e8e5cfae02eb39fa6482d392f6e69b1fab660ee24d334d43",
+                    "nonce" : "0x4bab589d9a367fe6",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0af3d2e9cd67b5f58950bdff16b93b5523e69e036d34657b5bc04dc465bd1bca08836a9b65b33f4e965f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0928f490a07248bf4e8e5cfae02eb39fa6482d392f6e69b1fab660ee24d334d43884bab589d9a367fe6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb8a4b3605bcbfc91bc376514e678164700a5e2df38a4c1d9d7a45fdd9529df5",
+        "lastblockhash" : "0xf1a98bff9294751a41f7ecc43b282a6af622af4c8c282b2cb3813001a28f0a43",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput3Fail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0x70fa6b532f6efd276bfb8a0b0fd6abf9bba103c416d390cdb3a9269df7bf8b90",
-                    "mixHash" : "0xe2f4ff7cd899f19055fec59b7468e989921e8b42c2d882e19e58d585f9128d78",
-                    "nonce" : "0x15ee2f60ebfd6156",
+                    "hash" : "0xf33f0f33881b13b8bae21eae3ff66fe69372048ca796fbf815e52fab8e43e942",
+                    "mixHash" : "0xde9c7fd6730b52873289d4ecff5179da09e8d02d5292a1f05c94cb3dfce745f4",
+                    "nonce" : "0xe995fc5bec673792",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0e2f4ff7cd899f19055fec59b7468e989921e8b42c2d882e19e58d585f9128d788815ee2f60ebfd6156f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0de9c7fd6730b52873289d4ecff5179da09e8d02d5292a1f05c94cb3dfce745f488e995fc5bec673792f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70fa6b532f6efd276bfb8a0b0fd6abf9bba103c416d390cdb3a9269df7bf8b90",
+        "lastblockhash" : "0xf33f0f33881b13b8bae21eae3ff66fe69372048ca796fbf815e52fab8e43e942",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
index 6b3159d02..a47855e28 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x632f2fe2293542b33f253d7abb31e4650b2489267a04ce3bc0247391bef6d163",
-                    "mixHash" : "0x0e7c3752966fc8fc7f5eca7ab5bfda615b3fe996f32a0b1d097ffdbabd3191a0",
-                    "nonce" : "0x1abc38fbe011ce94",
+                    "hash" : "0x734c18e38dc0b505104279d29efbd19308d179331a5b21c2eff34319fa4ae23b",
+                    "mixHash" : "0x6519b763287f83eb96e304a9795dcb9d56333dacb55d0765fb167b05abcf21ab",
+                    "nonce" : "0x6ab1f365ee92074e",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0x5bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00e7c3752966fc8fc7f5eca7ab5bfda615b3fe996f32a0b1d097ffdbabd3191a0881abc38fbe011ce94c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06519b763287f83eb96e304a9795dcb9d56333dacb55d0765fb167b05abcf21ab886ab1f365ee92074ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x632f2fe2293542b33f253d7abb31e4650b2489267a04ce3bc0247391bef6d163",
+        "lastblockhash" : "0x734c18e38dc0b505104279d29efbd19308d179331a5b21c2eff34319fa4ae23b",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput3_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x12320652bb9e091746fb8e47afca7bd2444a9b645f8d5d467dd080e4ea98ded3",
-                    "mixHash" : "0x85484a3110d06eb66483014e7b15176335af588e9812a9b3b93356673d926d7a",
-                    "nonce" : "0x1a6783b79dd409ea",
+                    "hash" : "0xf98ea290127bfea12a76f9b3b261d76fbde99d637f48e2f2c06f2e4ee682903e",
+                    "mixHash" : "0xe96e7a79a61526931feb7675f2e4b8270e4c2dd1441d5f2d239a7aa652beb026",
+                    "nonce" : "0x361515d197bb50af",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0xb6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a085484a3110d06eb66483014e7b15176335af588e9812a9b3b93356673d926d7a881a6783b79dd409eac0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e96e7a79a61526931feb7675f2e4b8270e4c2dd1441d5f2d239a7aa652beb02688361515d197bb50afc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12320652bb9e091746fb8e47afca7bd2444a9b645f8d5d467dd080e4ea98ded3",
+        "lastblockhash" : "0xf98ea290127bfea12a76f9b3b261d76fbde99d637f48e2f2c06f2e4ee682903e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf5f587c74e3c6f721be38a5c468c127b2b6400b9a4821dce8fd3b4dba5459da2",
-                    "mixHash" : "0x8c4e801aa4da59493d170f6e52ef1c992d95fb0a614e95cc8a71f393418d3a76",
-                    "nonce" : "0x20fa176a060ee22c",
+                    "hash" : "0xaf16c05be53d611e3386ce1932d6889bd23a62eb39a42531378c37174e671921",
+                    "mixHash" : "0x1f02d0e6497e6de867e411a0407bb8cfc5bdf720a555a18c797a6dfe7de73a75",
+                    "nonce" : "0x9bb41e32da86c5c1",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08c4e801aa4da59493d170f6e52ef1c992d95fb0a614e95cc8a71f393418d3a768820fa176a060ee22cc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01f02d0e6497e6de867e411a0407bb8cfc5bdf720a555a18c797a6dfe7de73a75889bb41e32da86c5c1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5f587c74e3c6f721be38a5c468c127b2b6400b9a4821dce8fd3b4dba5459da2",
+        "lastblockhash" : "0xaf16c05be53d611e3386ce1932d6889bd23a62eb39a42531378c37174e671921",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd0e5abdebced6bca9ae29fd0e121b80aafeb40b7df94a3b26fe816977987b80b",
-                    "mixHash" : "0xd97205c467b10f74e6a9109ad150e81426024cdb6f2da5db6cf89132081fd476",
-                    "nonce" : "0xc979106ab28528b5",
+                    "hash" : "0xc7bbae7bdbf619d1dd69c1c08b97987070a0247ec3bf6b2248de6e2cadf999a1",
+                    "mixHash" : "0xa720bd07e1771162de3c1321be032ac15cda1efabaa061d5de41e81aca9ad18c",
+                    "nonce" : "0x0e31db700e8351cb",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d97205c467b10f74e6a9109ad150e81426024cdb6f2da5db6cf89132081fd47688c979106ab28528b5c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a720bd07e1771162de3c1321be032ac15cda1efabaa061d5de41e81aca9ad18c880e31db700e8351cbc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0e5abdebced6bca9ae29fd0e121b80aafeb40b7df94a3b26fe816977987b80b",
+        "lastblockhash" : "0xc7bbae7bdbf619d1dd69c1c08b97987070a0247ec3bf6b2248de6e2cadf999a1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9d79d2884067d3ba37805a8c7f18d1e3b225300155fc96e79ebb14700364c788",
-                    "mixHash" : "0xc261b2406228a3e0cd55a90976c4796f5d20838a4a8e95886b0673a0e60495b5",
-                    "nonce" : "0x927200f359bd35b1",
+                    "hash" : "0x599aeaec3ca03f662263280af7ce7df9acb0d8c51fb5c8175f147eb134d44353",
+                    "mixHash" : "0xd34b496949775c8d200e0359d5af120654f49516612d3dde54e7e18c6e85d23f",
+                    "nonce" : "0x74d1bea5f86599e8",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c261b2406228a3e0cd55a90976c4796f5d20838a4a8e95886b0673a0e60495b588927200f359bd35b1c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d34b496949775c8d200e0359d5af120654f49516612d3dde54e7e18c6e85d23f8874d1bea5f86599e8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d79d2884067d3ba37805a8c7f18d1e3b225300155fc96e79ebb14700364c788",
+        "lastblockhash" : "0x599aeaec3ca03f662263280af7ce7df9acb0d8c51fb5c8175f147eb134d44353",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc3369f9a200ba5779cfe9be23357b90d2f6062a19257e4c4b82428c23b6fc53f",
-                    "mixHash" : "0x62f4fb0f929102bbf7ec4c60f9cff5bd430e40df52c04e461e1cc7cca26bfac3",
-                    "nonce" : "0x6e4b2689a852de90",
+                    "hash" : "0x401885211c9da8c0d9e0c5f3d0172c01b423a394278d6751100c64352be0d810",
+                    "mixHash" : "0xb9c00ecf47e078cdfa0ccbf76b501420f7c29ebee066c3912f31e5406a79ce1e",
+                    "nonce" : "0x4ad1e96f3ed78925",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a062f4fb0f929102bbf7ec4c60f9cff5bd430e40df52c04e461e1cc7cca26bfac3886e4b2689a852de90c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b9c00ecf47e078cdfa0ccbf76b501420f7c29ebee066c3912f31e5406a79ce1e884ad1e96f3ed78925c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc3369f9a200ba5779cfe9be23357b90d2f6062a19257e4c4b82428c23b6fc53f",
+        "lastblockhash" : "0x401885211c9da8c0d9e0c5f3d0172c01b423a394278d6751100c64352be0d810",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
index f2a88bff8..a87859d48 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput3_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xc05eb75aa3fb25056ca4696af93ba49e66182e346d985fd5cab24935c72000f6",
-                    "mixHash" : "0xf428232e260da7208f066cb52d03b30014202bea8515f489fe3393a76257fcbf",
-                    "nonce" : "0x6cd3e0c1f0ad45d9",
+                    "hash" : "0x7ab6c6dccc9ea09b76b2a3384bb74eb26ee0db5a8ecb7f86231a1a9990323ce6",
+                    "mixHash" : "0xbd05824467238574c0c90acd815719f3db2a6b3b3a2d5101a9981b3d27d4f7a8",
+                    "nonce" : "0x32ef1e709faada5a",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
+                    "stateRoot" : "0xb8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f428232e260da7208f066cb52d03b30014202bea8515f489fe3393a76257fcbf886cd3e0c1f0ad45d9f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bd05824467238574c0c90acd815719f3db2a6b3b3a2d5101a9981b3d27d4f7a88832ef1e709faada5af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc05eb75aa3fb25056ca4696af93ba49e66182e346d985fd5cab24935c72000f6",
+        "lastblockhash" : "0x7ab6c6dccc9ea09b76b2a3384bb74eb26ee0db5a8ecb7f86231a1a9990323ce6",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput3_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xe5576f3dab1eb71fb0d6da3419131035844a64ec63818b2e57ef1993656b5442",
-                    "mixHash" : "0x421de6e567e7bacfb6069105017c3a1512dea35bcf12eee2239e2a4057140cc7",
-                    "nonce" : "0x0a74d4885b3bb70b",
+                    "hash" : "0x80bcd7eb0629368cce9c25c60409bcd2c010481b97598eeb5c75563f60f64efd",
+                    "mixHash" : "0x08fbfce683c534282bd3210064068fc6e6054d529f917d7633e794cf2828a7a0",
+                    "nonce" : "0x270a9c7285a10586",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
+                    "stateRoot" : "0x4000e18ce03d7f423d8534a1125745dca8e8afb0e7f1e9c9a718d0e44a3df87d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0421de6e567e7bacfb6069105017c3a1512dea35bcf12eee2239e2a4057140cc7880a74d4885b3bb70bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04000e18ce03d7f423d8534a1125745dca8e8afb0e7f1e9c9a718d0e44a3df87da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a008fbfce683c534282bd3210064068fc6e6054d529f917d7633e794cf2828a7a088270a9c7285a10586f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5576f3dab1eb71fb0d6da3419131035844a64ec63818b2e57ef1993656b5442",
+        "lastblockhash" : "0x80bcd7eb0629368cce9c25c60409bcd2c010481b97598eeb5c75563f60f64efd",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput3_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x28a5b19c43e27fad94912919690b533fe5800b50d54d71cff914bda981e6f333",
-                    "mixHash" : "0x3a12f33b85824cb8068df78bbefd725ccb77c8ade0b13f5ecaf9f7e3c3275f6d",
-                    "nonce" : "0xaad9e7beff74e697",
+                    "hash" : "0xdb9852308d5c9d7073352c6200799753d1f284b232f39720b8eff5b8bc2071c8",
+                    "mixHash" : "0x0173bf6dfe6b93d54894b9edc06a2c6d1c444d8ad424c9ba5f400a3f2700c641",
+                    "nonce" : "0xfd42ad16abcf4b45",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03a12f33b85824cb8068df78bbefd725ccb77c8ade0b13f5ecaf9f7e3c3275f6d88aad9e7beff74e697f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a00173bf6dfe6b93d54894b9edc06a2c6d1c444d8ad424c9ba5f400a3f2700c64188fd42ad16abcf4b45f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28a5b19c43e27fad94912919690b533fe5800b50d54d71cff914bda981e6f333",
+        "lastblockhash" : "0xdb9852308d5c9d7073352c6200799753d1f284b232f39720b8eff5b8bc2071c8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput3_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xf068d86a1307db306ebe2ce69ba927430c0f4a2ebea63a84b2e2e4e920d09d89",
-                    "mixHash" : "0xf87809ed052e20ef8d709aebba806dc6607e7c3686ac7303513084d5b068ab34",
-                    "nonce" : "0x2a9e0bee6161cced",
+                    "hash" : "0x3eca4a9a185f35a0b123bf704b21aad6adb4d567200c8c94668d64299f457ac1",
+                    "mixHash" : "0x49cd228f894743894e002908da7d30e341d4453bc88c85fba41b89f3baa3f800",
+                    "nonce" : "0x74ebe5e5d4c49344",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f87809ed052e20ef8d709aebba806dc6607e7c3686ac7303513084d5b068ab34882a9e0bee6161ccedf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a049cd228f894743894e002908da7d30e341d4453bc88c85fba41b89f3baa3f8008874ebe5e5d4c49344f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf068d86a1307db306ebe2ce69ba927430c0f4a2ebea63a84b2e2e4e920d09d89",
+        "lastblockhash" : "0x3eca4a9a185f35a0b123bf704b21aad6adb4d567200c8c94668d64299f457ac1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput3_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x0747777a52be2881e277b6b457a795f5c74b2a66dd811954ef75a80f0ef0fe28",
-                    "mixHash" : "0xeec6d1de81f1a301c86714539affe000b132b101992de100fe6f0749cd13c22f",
-                    "nonce" : "0x250baa9813ef1d05",
+                    "hash" : "0x524724ef14a510a684b9f40fda1f351c468c02ec568dff7c1dde079e7c2bdb74",
+                    "mixHash" : "0xf99d165a24a4c501db2ba6695fbe201acd03adc1961b9afe15ded8c46929962a",
+                    "nonce" : "0x2be623186eddcc44",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0eec6d1de81f1a301c86714539affe000b132b101992de100fe6f0749cd13c22f88250baa9813ef1d05f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0f99d165a24a4c501db2ba6695fbe201acd03adc1961b9afe15ded8c46929962a882be623186eddcc44f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0747777a52be2881e277b6b457a795f5c74b2a66dd811954ef75a80f0ef0fe28",
+        "lastblockhash" : "0x524724ef14a510a684b9f40fda1f351c468c02ec568dff7c1dde079e7c2bdb74",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput3_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x98afd96930b0a80123568601716dd2ac7aa73c34e6a324e4b508531d85ea6c43",
-                    "mixHash" : "0x7a10ccfc69e0b772ce9adfe4bc6f18802e96ecb591bed500b6cec71b2b837ad0",
-                    "nonce" : "0xee5bff38c18da114",
+                    "hash" : "0x427785748e46710dfbf1f2bdf648ed6fb53ff1f2d470c148d658bcac812d9812",
+                    "mixHash" : "0x518871e5e3519cc10f3fbe0f522e6f16c910b0c174449bcccdb9851cc2c2f534",
+                    "nonce" : "0xd3b15b839d147308",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a07a10ccfc69e0b772ce9adfe4bc6f18802e96ecb591bed500b6cec71b2b837ad088ee5bff38c18da114f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0518871e5e3519cc10f3fbe0f522e6f16c910b0c174449bcccdb9851cc2c2f53488d3b15b839d147308f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98afd96930b0a80123568601716dd2ac7aa73c34e6a324e4b508531d85ea6c43",
+        "lastblockhash" : "0x427785748e46710dfbf1f2bdf648ed6fb53ff1f2d470c148d658bcac812d9812",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
index 330c5683f..870e42949 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x36a214dd6dd42f3f3b76b9c8887ab08382f00e824c66c32d4a9e23d1c99e8fd4",
-                    "mixHash" : "0xfaab1f246c9848c150de3ae096daeaf27ce1e8f757b961be457207a9449ed123",
-                    "nonce" : "0x5b9277ba289685e9",
+                    "hash" : "0xdd6a5910463313396c622e391438f22034e4139c1faeae0cad5b453e3b5e9d97",
+                    "mixHash" : "0xd5a4fd9e951bb713c8d7d298ce4bf7f665bae59003bf50f0b03ac5bf7cd27264",
+                    "nonce" : "0x433c0d0d73551bac",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0xe2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0faab1f246c9848c150de3ae096daeaf27ce1e8f757b961be457207a9449ed123885b9277ba289685e9c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d5a4fd9e951bb713c8d7d298ce4bf7f665bae59003bf50f0b03ac5bf7cd2726488433c0d0d73551bacc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36a214dd6dd42f3f3b76b9c8887ab08382f00e824c66c32d4a9e23d1c99e8fd4",
+        "lastblockhash" : "0xdd6a5910463313396c622e391438f22034e4139c1faeae0cad5b453e3b5e9d97",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput3partialFail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9570e13e1f37b6be7af2f7915757de05960f52b109ec836e53234f58479d0d0f",
-                    "mixHash" : "0xaca4ae484c3712a643616d6718f9633f04294ac6217783406f4a93e5b3d8b625",
-                    "nonce" : "0x03e1ecb17b3b35ae",
+                    "hash" : "0xe380c4e1540293d58729255c899afebda6daf1e7a3cc9e285f973a9594af3aaa",
+                    "mixHash" : "0xe0e9753a62f50dd358fe701d17d0449ed1f8e985f10e6266349c3467f39a5301",
+                    "nonce" : "0xbf0ccc85d5ae4584",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0xe893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0aca4ae484c3712a643616d6718f9633f04294ac6217783406f4a93e5b3d8b6258803e1ecb17b3b35aec0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e0e9753a62f50dd358fe701d17d0449ed1f8e985f10e6266349c3467f39a530188bf0ccc85d5ae4584c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9570e13e1f37b6be7af2f7915757de05960f52b109ec836e53234f58479d0d0f",
+        "lastblockhash" : "0xe380c4e1540293d58729255c899afebda6daf1e7a3cc9e285f973a9594af3aaa",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput3partialFail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9f60ad3e7d66220e3b68cf55ea6771df83aeb05cb7ae9279206c35e6738f11ef",
-                    "mixHash" : "0x2117ffffe143c96757242bfdfdf8a818c85d3c1bdf262f5092c2c1c02aaec8bb",
-                    "nonce" : "0x3f3881b4da5bba6c",
+                    "hash" : "0xa0d10b04d410353d594e67ddd36975ea28fe7c697316a113b770d5c6c9843a36",
+                    "mixHash" : "0x693b97c69900f62c92e83fa33ee5419c2c1c0152395ce83ceb8f5737ad415430",
+                    "nonce" : "0x4cdbc87dac570f8d",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02117ffffe143c96757242bfdfdf8a818c85d3c1bdf262f5092c2c1c02aaec8bb883f3881b4da5bba6cc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0693b97c69900f62c92e83fa33ee5419c2c1c0152395ce83ceb8f5737ad415430884cdbc87dac570f8dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f60ad3e7d66220e3b68cf55ea6771df83aeb05cb7ae9279206c35e6738f11ef",
+        "lastblockhash" : "0xa0d10b04d410353d594e67ddd36975ea28fe7c697316a113b770d5c6c9843a36",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4be125aad1c4bb7075c6b1eabf4ac193a3cdbd50fe47c4fd0369a4b45ff7b2d5",
-                    "mixHash" : "0x8b3017e0b35e4dd0cfdf027564707514adfdf90177541b6263ef13d9f93114e6",
-                    "nonce" : "0xb19398daa2f7c2e6",
+                    "hash" : "0x91aa67ecd7b7e9c8db7142746ed5454ae062cb5a623439ddc8c4f04501e84062",
+                    "mixHash" : "0xb1fba2533eb2e5cdcf830d47eaaa4a2182125bb6b7f1dae1ebae33cf7fca3467",
+                    "nonce" : "0x24efc254fedc87ec",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08b3017e0b35e4dd0cfdf027564707514adfdf90177541b6263ef13d9f93114e688b19398daa2f7c2e6c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b1fba2533eb2e5cdcf830d47eaaa4a2182125bb6b7f1dae1ebae33cf7fca34678824efc254fedc87ecc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4be125aad1c4bb7075c6b1eabf4ac193a3cdbd50fe47c4fd0369a4b45ff7b2d5",
+        "lastblockhash" : "0x91aa67ecd7b7e9c8db7142746ed5454ae062cb5a623439ddc8c4f04501e84062",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x53c339fba69ce693efc936329050b1db1f3d990968f37486f4ea3a978afc8940",
-                    "mixHash" : "0x47721121da08d1921bb66cac8063032e3623fba44b8e552ae8fe3126f5cffede",
-                    "nonce" : "0x23bf1c3546a68f7f",
+                    "hash" : "0x499f2c759250e0b71453ed0a1bd789f16d068503ec89e87fc1bb081e43636f7b",
+                    "mixHash" : "0xd02b4623e99636ec5135c9a48ab059eaf9d1eb0ecae23daf384fd7c60d88c535",
+                    "nonce" : "0x06a81bc8b231521a",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047721121da08d1921bb66cac8063032e3623fba44b8e552ae8fe3126f5cffede8823bf1c3546a68f7fc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d02b4623e99636ec5135c9a48ab059eaf9d1eb0ecae23daf384fd7c60d88c5358806a81bc8b231521ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53c339fba69ce693efc936329050b1db1f3d990968f37486f4ea3a978afc8940",
+        "lastblockhash" : "0x499f2c759250e0b71453ed0a1bd789f16d068503ec89e87fc1bb081e43636f7b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb46dd2290b9763174b703151e3142216664b05873afe0beed633846699e329d0",
-                    "mixHash" : "0x80b2b5c109e4620444c9b55ab4552c768952082c827763ee8b0021b4b09e7627",
-                    "nonce" : "0xa41a295ad42023c2",
+                    "hash" : "0x39afb98453077a843670021a2da8caf7091f99c6029a06c22acc6a6fe52c96ea",
+                    "mixHash" : "0xce4f82df2a636c94174cd59c5c567d744db18a23b9a518f895dff6d89c7b06b1",
+                    "nonce" : "0x4d4e20aec6abe564",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a080b2b5c109e4620444c9b55ab4552c768952082c827763ee8b0021b4b09e762788a41a295ad42023c2c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ce4f82df2a636c94174cd59c5c567d744db18a23b9a518f895dff6d89c7b06b1884d4e20aec6abe564c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb46dd2290b9763174b703151e3142216664b05873afe0beed633846699e329d0",
+        "lastblockhash" : "0x39afb98453077a843670021a2da8caf7091f99c6029a06c22acc6a6fe52c96ea",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
index 020ce49ec..5f261168f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput3partialFail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xb52c516c298570e579db23c5e6d5961cb198f3d1fed9dd91251e9e2c79b9296f",
-                    "mixHash" : "0x9402b72b31fd80bb38cb193b45db60ad790ffdc095c601391905d34a18c22a81",
-                    "nonce" : "0x49d9bbf6b579065f",
+                    "hash" : "0x5b66ae3358bbc29dc9ea3fb1640c95b77a9f950d39eb8486d208cddda3053eb9",
+                    "mixHash" : "0x049de8ebd693b40d37fddc2205b99461afd6bafd76400be92c7623fcaf24aa9b",
+                    "nonce" : "0x493380bdaa278881",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
+                    "stateRoot" : "0x64f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a09402b72b31fd80bb38cb193b45db60ad790ffdc095c601391905d34a18c22a818849d9bbf6b579065ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0049de8ebd693b40d37fddc2205b99461afd6bafd76400be92c7623fcaf24aa9b88493380bdaa278881f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb52c516c298570e579db23c5e6d5961cb198f3d1fed9dd91251e9e2c79b9296f",
+        "lastblockhash" : "0x5b66ae3358bbc29dc9ea3fb1640c95b77a9f950d39eb8486d208cddda3053eb9",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput3partialFail_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xafdea0cbda550d02fb59fb50fc707de91e34ac0f91e4c34f002bbcee38523d89",
-                    "mixHash" : "0x3f0fa86c0af4b32a65f473f9b629c3c9e312a1f5a17bd0d51889485bc1bb2879",
-                    "nonce" : "0xb4f768c601cc8442",
+                    "hash" : "0xa5eeea52dcd3fe3c7896d0982745fc2ee97eb5c268424f786ca1fb290f519ef1",
+                    "mixHash" : "0xfb751660f2c5405dc1bf68ce727ce6c2dd12c7077b3046822527d2cb15b0bba0",
+                    "nonce" : "0xb9b5161a1ddb0203",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
+                    "stateRoot" : "0xc692800ae0073996da2e28f0bf8865701834f8fa3192a48363845753c2cabfc2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a03f0fa86c0af4b32a65f473f9b629c3c9e312a1f5a17bd0d51889485bc1bb287988b4f768c601cc8442f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c692800ae0073996da2e28f0bf8865701834f8fa3192a48363845753c2cabfc2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0fb751660f2c5405dc1bf68ce727ce6c2dd12c7077b3046822527d2cb15b0bba088b9b5161a1ddb0203f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafdea0cbda550d02fb59fb50fc707de91e34ac0f91e4c34f002bbcee38523d89",
+        "lastblockhash" : "0xa5eeea52dcd3fe3c7896d0982745fc2ee97eb5c268424f786ca1fb290f519ef1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput3partialFail_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xf86e8030419fbb61e3eba6400cdadd0a50591921d32733f7bd746ba2633fbb2f",
-                    "mixHash" : "0xa65df870abb79b8929b8e31491feb48fb840b4626b48d49a6d23c47db8e539be",
-                    "nonce" : "0xfc4f93a801c6a5c5",
+                    "hash" : "0x8f5e6fb6afcfea379bf3994165f36b6509c3990a82ebd4166f5d24f9e738df06",
+                    "mixHash" : "0x38c0f8d0ac4acd3b28bd5f4774f82531a00d43d4dd8e04ea3d6b7a53aa992350",
+                    "nonce" : "0x57502615bda70cb6",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0a65df870abb79b8929b8e31491feb48fb840b4626b48d49a6d23c47db8e539be88fc4f93a801c6a5c5f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a038c0f8d0ac4acd3b28bd5f4774f82531a00d43d4dd8e04ea3d6b7a53aa9923508857502615bda70cb6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf86e8030419fbb61e3eba6400cdadd0a50591921d32733f7bd746ba2633fbb2f",
+        "lastblockhash" : "0x8f5e6fb6afcfea379bf3994165f36b6509c3990a82ebd4166f5d24f9e738df06",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput3partialFail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0xb6d7c6f8299c7e71575adc9609b46ec3681a636708ac290135ee1725411ed89b",
-                    "mixHash" : "0xcd57f4d224da651a7cac8e5ddddacb51200b08dd2b07adf7ced3ee8eeec3bee6",
-                    "nonce" : "0xf18016b1fe2d7d62",
+                    "hash" : "0xa858d9fbcb40f0e0939fb37c463c2b67045f7d036fe388d1e5f39d9833f0e4df",
+                    "mixHash" : "0x24ae940e70426f5fac26f25c991527d62c969a84b1422f37565e210549dbcd83",
+                    "nonce" : "0x7e8a0a81ae36adf1",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cd57f4d224da651a7cac8e5ddddacb51200b08dd2b07adf7ced3ee8eeec3bee688f18016b1fe2d7d62f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a024ae940e70426f5fac26f25c991527d62c969a84b1422f37565e210549dbcd83887e8a0a81ae36adf1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6d7c6f8299c7e71575adc9609b46ec3681a636708ac290135ee1725411ed89b",
+        "lastblockhash" : "0xa858d9fbcb40f0e0939fb37c463c2b67045f7d036fe388d1e5f39d9833f0e4df",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput3partialFail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0xd7a31cf8fe2f4ea7166010b55652336e69cb1083c8463b2a49a8945a0d9c74a7",
-                    "mixHash" : "0xe25879d9473f4b5091f1daf8766e5c716940a960c30e2ff2f1fc1ae690e18082",
-                    "nonce" : "0xbf26013a36c34ff2",
+                    "hash" : "0x1268e6e8e4c123adb73644de67ff377bb81d1d313688b63b21bd3147073e9a6f",
+                    "mixHash" : "0x12100ac1703d225c9fa05160ee0d45e3c59057c08b372040c339574b3bf8f962",
+                    "nonce" : "0x4fa324552c6fdd1b",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0e25879d9473f4b5091f1daf8766e5c716940a960c30e2ff2f1fc1ae690e1808288bf26013a36c34ff2f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a012100ac1703d225c9fa05160ee0d45e3c59057c08b372040c339574b3bf8f962884fa324552c6fdd1bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7a31cf8fe2f4ea7166010b55652336e69cb1083c8463b2a49a8945a0d9c74a7",
+        "lastblockhash" : "0x1268e6e8e4c123adb73644de67ff377bb81d1d313688b63b21bd3147073e9a6f",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput3partialFail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0x9ae0cab7dba9a675edf13a737e8771f6a6be6e12e56e4976e3d84929a332ca9f",
-                    "mixHash" : "0x1113569b7f396627c935d4a59ec83c934319ef04f873ca702974acb458dccc49",
-                    "nonce" : "0x5ee54cba68dac4e9",
+                    "hash" : "0x5a1b6a2a850ba20f397dcbdc435d8c5b5331e375207c069f4b4661cfac872689",
+                    "mixHash" : "0x1c1adc6dd7d0216b4fdc25e2b148d6bcb439bbe6a9b2a74c7b2548d0ec34dd84",
+                    "nonce" : "0xe7233b6d9b6244cf",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a01113569b7f396627c935d4a59ec83c934319ef04f873ca702974acb458dccc49885ee54cba68dac4e9f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a01c1adc6dd7d0216b4fdc25e2b148d6bcb439bbe6a9b2a74c7b2548d0ec34dd8488e7233b6d9b6244cff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ae0cab7dba9a675edf13a737e8771f6a6be6e12e56e4976e3d84929a332ca9f",
+        "lastblockhash" : "0x5a1b6a2a850ba20f397dcbdc435d8c5b5331e375207c069f4b4661cfac872689",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
index f9ec76a23..39c219c28 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
@@ -2,7 +2,7 @@
     "callOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xeecee9ebc1324a34d0f872820c2d5c5581edd87482eea88eb0fa97a61926fc02",
-                    "mixHash" : "0x4d262c4ae99d5bc27f5fadc93dea82a4b33fbd27fb885e8037dd2de644b3c29b",
-                    "nonce" : "0x290efb562f5f49d8",
+                    "hash" : "0x740b3df82fba2ed8eac734e0712712e9dbfdb4a737dc852382652fc3b569e6b0",
+                    "mixHash" : "0x97f03b821bde7f5635fff24a5a1ed500239c22617874550f1d6a334b9be78d7b",
+                    "nonce" : "0x9da44990a731782e",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0x1af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04d262c4ae99d5bc27f5fadc93dea82a4b33fbd27fb885e8037dd2de644b3c29b88290efb562f5f49d8c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a097f03b821bde7f5635fff24a5a1ed500239c22617874550f1d6a334b9be78d7b889da44990a731782ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeecee9ebc1324a34d0f872820c2d5c5581edd87482eea88eb0fa97a61926fc02",
+        "lastblockhash" : "0x740b3df82fba2ed8eac734e0712712e9dbfdb4a737dc852382652fc3b569e6b0",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callOutput3partial_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5ce640c6e517d7025caab3377ad5d8c4bf2f8b5bb9b65e7512da5ace8c5f29b3",
-                    "mixHash" : "0xf0a2a41bb676c3397dae7e30d72c87d0ed82654335bb2b7c1fc5fcc4503d301b",
-                    "nonce" : "0x86cb693ea0650878",
+                    "hash" : "0xd763e9376403915aa6f8931417025080d313c74e7f85b77eea89d20c4cc575a9",
+                    "mixHash" : "0x64a98ea17b19c2e326d5b69f98039ee89d0c6ad96454d09d0b36284e7153bfe0",
+                    "nonce" : "0xd7540ae2792bd094",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0xaf67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19fae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f0a2a41bb676c3397dae7e30d72c87d0ed82654335bb2b7c1fc5fcc4503d301b8886cb693ea0650878c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19faea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a064a98ea17b19c2e326d5b69f98039ee89d0c6ad96454d09d0b36284e7153bfe088d7540ae2792bd094c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ce640c6e517d7025caab3377ad5d8c4bf2f8b5bb9b65e7512da5ace8c5f29b3",
+        "lastblockhash" : "0xd763e9376403915aa6f8931417025080d313c74e7f85b77eea89d20c4cc575a9",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callOutput3partial_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x7aeb5f5f164c96a70cc6f736d1763648cc6228048279653722645878e0da2fd1",
-                    "mixHash" : "0x2600edeecf97656dc6b6536412f9162ca6c86fca22d31daec6c0808f7814da37",
-                    "nonce" : "0x8d28f17d6b3714e7",
+                    "hash" : "0xff0b3d92823460fe4bb8c3ff6349b11baeebab4619f65524fcfbf672ca97b009",
+                    "mixHash" : "0xd30f1af4bca6fcfe65295de63cc9ecaf13eaf6830b36128f2da1374b45b62467",
+                    "nonce" : "0x630e961a901b14f1",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02600edeecf97656dc6b6536412f9162ca6c86fca22d31daec6c0808f7814da37888d28f17d6b3714e7c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d30f1af4bca6fcfe65295de63cc9ecaf13eaf6830b36128f2da1374b45b6246788630e961a901b14f1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7aeb5f5f164c96a70cc6f736d1763648cc6228048279653722645878e0da2fd1",
+        "lastblockhash" : "0xff0b3d92823460fe4bb8c3ff6349b11baeebab4619f65524fcfbf672ca97b009",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x34c4fe45bcf80efe6196e19a2654066854213e1d2285ecba5960518fb522dd7a",
-                    "mixHash" : "0xff134400c614767acaf62225cbc70a9e9009f643514f56ce72bddcf63dadca41",
-                    "nonce" : "0x4acc735db3c4b0d8",
+                    "hash" : "0x37dc7d29499497624ff9fe2f7b3eacd39f643415682b37fd99dbf64f27a7d61b",
+                    "mixHash" : "0x5ebad798fba3739ce7cf2c156088db0a24ebd0aa6303c9589e40d36b63a0f2de",
+                    "nonce" : "0x350222d1a94105cf",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ff134400c614767acaf62225cbc70a9e9009f643514f56ce72bddcf63dadca41884acc735db3c4b0d8c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05ebad798fba3739ce7cf2c156088db0a24ebd0aa6303c9589e40d36b63a0f2de88350222d1a94105cfc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34c4fe45bcf80efe6196e19a2654066854213e1d2285ecba5960518fb522dd7a",
+        "lastblockhash" : "0x37dc7d29499497624ff9fe2f7b3eacd39f643415682b37fd99dbf64f27a7d61b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa7add62ebdd8904bf52c450914d4beeb7299b4cf66f9ca73dbc988f9df27416c",
-                    "mixHash" : "0x64c440d2ed30192bab69e8b34206c7844aff5ddb2867f44fef76a73bc4adddf5",
-                    "nonce" : "0xe3ceb9a34c5d49c5",
+                    "hash" : "0x64598c8dda6e0db88fb6d6be11171efec70d7cd969e1b98c4cef9b9fa5dfe1a9",
+                    "mixHash" : "0x0d5268bd6007803f092b23ad4a06117fdcabb5801de15c37aa60057e9f6e1952",
+                    "nonce" : "0x8c4f5906c02bed3b",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a064c440d2ed30192bab69e8b34206c7844aff5ddb2867f44fef76a73bc4adddf588e3ceb9a34c5d49c5c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00d5268bd6007803f092b23ad4a06117fdcabb5801de15c37aa60057e9f6e1952888c4f5906c02bed3bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7add62ebdd8904bf52c450914d4beeb7299b4cf66f9ca73dbc988f9df27416c",
+        "lastblockhash" : "0x64598c8dda6e0db88fb6d6be11171efec70d7cd969e1b98c4cef9b9fa5dfe1a9",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x534e3d690aa7bb3b2396483757f395d5c329b81609f9866d9a21daf0f7875fe3",
-                    "mixHash" : "0x0954e5b5cce6b964de5497a7eddd81ba991c27ec7e82fdd5e2d83bca20217c47",
-                    "nonce" : "0x4dbaf893b2e007f7",
+                    "hash" : "0x082929eacea06c454191aa5f2a19ca04a9c0a88029b0d031228ed5164bdeed4f",
+                    "mixHash" : "0xb0b343a49ac295ddad74ac2d8cdd9b47388966fc97ed7e1d93e52aaebdd0ba70",
+                    "nonce" : "0x5709dee0c019a419",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00954e5b5cce6b964de5497a7eddd81ba991c27ec7e82fdd5e2d83bca20217c47884dbaf893b2e007f7c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b0b343a49ac295ddad74ac2d8cdd9b47388966fc97ed7e1d93e52aaebdd0ba70885709dee0c019a419c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x534e3d690aa7bb3b2396483757f395d5c329b81609f9866d9a21daf0f7875fe3",
+        "lastblockhash" : "0x082929eacea06c454191aa5f2a19ca04a9c0a88029b0d031228ed5164bdeed4f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
index 03fb4fc73..4100635c8 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
@@ -2,7 +2,7 @@
     "callOutput3partial_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x5a1b4e9af19c9f8ffe394ca80e78db46cb7d87b6e4b518b0af760be47595864c",
-                    "mixHash" : "0x15fa1f6f2404507e536d41c794e6bd50bdfa93c8472fbb1841e1c576c44f2c10",
-                    "nonce" : "0xc7fb9f352cb307e3",
+                    "hash" : "0xf9f1e20b9268e24ada6975348b6d4a1512c9e7608b36f7533d3bf0867c422a82",
+                    "mixHash" : "0x34aa38f00e2202e924c8753e43b4513f2bac9704d1f6a6af5e7a37082c20b07a",
+                    "nonce" : "0xda9339d05531c963",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
+                    "stateRoot" : "0x0c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61ae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a015fa1f6f2404507e536d41c794e6bd50bdfa93c8472fbb1841e1c576c44f2c1088c7fb9f352cb307e3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61aea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a034aa38f00e2202e924c8753e43b4513f2bac9704d1f6a6af5e7a37082c20b07a88da9339d05531c963f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a1b4e9af19c9f8ffe394ca80e78db46cb7d87b6e4b518b0af760be47595864c",
+        "lastblockhash" : "0xf9f1e20b9268e24ada6975348b6d4a1512c9e7608b36f7533d3bf0867c422a82",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "callOutput3partial_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xd7b7b5b1a71f2aaeb4d7bf16eb206446ef1cf9962711d364e476a99f50a5c5a7",
-                    "mixHash" : "0x2544cad82b79b55409091499952e7f2f1af8e1c3ab9b29ac3ecbd9476f1762f7",
-                    "nonce" : "0xb34b54f1f92da2b4",
+                    "hash" : "0xdf38a4f01f11961e9b2ccc233ed5984081c8b34ea758d1310b844b6e9e7f1b37",
+                    "mixHash" : "0xe0c9ec57960c9d4be3d14360f3eff66d4a2582d6fc8c580f59bc5c3858ec16b3",
+                    "nonce" : "0x7199e5b13ba9db2c",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
+                    "stateRoot" : "0xf739aeb44dee748d27ea475351b9d598a31faf737cca42b1b2b157f9fdf11785",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a02544cad82b79b55409091499952e7f2f1af8e1c3ab9b29ac3ecbd9476f1762f788b34b54f1f92da2b4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f739aeb44dee748d27ea475351b9d598a31faf737cca42b1b2b157f9fdf11785a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e0c9ec57960c9d4be3d14360f3eff66d4a2582d6fc8c580f59bc5c3858ec16b3887199e5b13ba9db2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7b7b5b1a71f2aaeb4d7bf16eb206446ef1cf9962711d364e476a99f50a5c5a7",
+        "lastblockhash" : "0xdf38a4f01f11961e9b2ccc233ed5984081c8b34ea758d1310b844b6e9e7f1b37",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "callOutput3partial_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x75e5a13bdf196acd1fec5f1498858cefca0f0208aa1a9e8afef67ee086de4a36",
-                    "mixHash" : "0x43c2b40a122182ea31ac6c456dc8ae7ceb517619e1a7b53d6a6c3b6e86fcaa9c",
-                    "nonce" : "0x856a346567983b01",
+                    "hash" : "0x442b9aece9ba8c8635e459ee17160a9ff7db54000102b5dda7432aac653e2da9",
+                    "mixHash" : "0xa64c1eb3214ab18384eb5d53addb1331e915ab89ba2ef697e316b3db503bac55",
+                    "nonce" : "0xef3f274bbacc6286",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a043c2b40a122182ea31ac6c456dc8ae7ceb517619e1a7b53d6a6c3b6e86fcaa9c88856a346567983b01f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a64c1eb3214ab18384eb5d53addb1331e915ab89ba2ef697e316b3db503bac5588ef3f274bbacc6286f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75e5a13bdf196acd1fec5f1498858cefca0f0208aa1a9e8afef67ee086de4a36",
+        "lastblockhash" : "0x442b9aece9ba8c8635e459ee17160a9ff7db54000102b5dda7432aac653e2da9",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "callOutput3partial_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x308d787c4dab649667c9cb025971355b69ed0b7181e1a9357b4c5a3cf799b14d",
-                    "mixHash" : "0xdf5e3eb925cb94a9d12e5fd843bf59ea6deaad3859c8c5d1a3443d5a0b3d562b",
-                    "nonce" : "0x10b6850998cca395",
+                    "hash" : "0xc716f680e320e8ce465b788161923493f03a671e6bfd44a92cdff67b90645606",
+                    "mixHash" : "0x70988a0bb2d40c04281cb5bac2e6b71a10b7eae6a9e269a0efa92362bf2fe2a3",
+                    "nonce" : "0x5964a2ef965f9e04",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0df5e3eb925cb94a9d12e5fd843bf59ea6deaad3859c8c5d1a3443d5a0b3d562b8810b6850998cca395f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a070988a0bb2d40c04281cb5bac2e6b71a10b7eae6a9e269a0efa92362bf2fe2a3885964a2ef965f9e04f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x308d787c4dab649667c9cb025971355b69ed0b7181e1a9357b4c5a3cf799b14d",
+        "lastblockhash" : "0xc716f680e320e8ce465b788161923493f03a671e6bfd44a92cdff67b90645606",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "callOutput3partial_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0dbba0",
-                    "hash" : "0x83ab0fb60128648c6ceec87007eea5be6642b33d67b5d33e9359374ce0fad19f",
-                    "mixHash" : "0xc9021303d701bb92ae703428df4ac2f2a9540345c4c5529dd740db42103a6383",
-                    "nonce" : "0x2da9848bf0c808fd",
+                    "hash" : "0x5cbf6b2a1b0db27361c69925ce97b9d98da3997930a2236e07c3d901ea9a519d",
+                    "mixHash" : "0xb687dd25ee6f761787b4afc39f478137a39ed53b1ea67ebd06ebb3539e65224a",
+                    "nonce" : "0x03fcd95a05e555f5",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0c9021303d701bb92ae703428df4ac2f2a9540345c4c5529dd740db42103a6383882da9848bf0c808fdf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0b687dd25ee6f761787b4afc39f478137a39ed53b1ea67ebd06ebb3539e65224a8803fcd95a05e555f5f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83ab0fb60128648c6ceec87007eea5be6642b33d67b5d33e9359374ce0fad19f",
+        "lastblockhash" : "0x5cbf6b2a1b0db27361c69925ce97b9d98da3997930a2236e07c3d901ea9a519d",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "callOutput3partial_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x34eaf91fb7bcc3df26789c1e1010ae1ddbddd356ddf72500cd5962355e53c95c",
-                    "mixHash" : "0x86e508d84c19756fb3ac9bd17d903ee3f4e16aef3ab9251b3e3f9af22e17cf98",
-                    "nonce" : "0x271ab5aac6f0650b",
+                    "hash" : "0x1d7cfff30212852612f537a45fe57f51d7b53e7e838ff24f015c0fd67cbe5a0b",
+                    "mixHash" : "0x3952f0460f3b60a5a4fbf62f6f680910efbc4d474706db3fa7e1b8f50eb37fd2",
+                    "nonce" : "0xd8d256fe785aebce",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a086e508d84c19756fb3ac9bd17d903ee3f4e16aef3ab9251b3e3f9af22e17cf9888271ab5aac6f0650bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a03952f0460f3b60a5a4fbf62f6f680910efbc4d474706db3fa7e1b8f50eb37fd288d8d256fe785aebcef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34eaf91fb7bcc3df26789c1e1010ae1ddbddd356ddf72500cd5962355e53c95c",
+        "lastblockhash" : "0x1d7cfff30212852612f537a45fe57f51d7b53e7e838ff24f015c0fd67cbe5a0b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
index e0d66cd83..7f7ffbebe 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x50897f86899086c1fe09b17fbaf1d007d5ddc17f3c88e78b5ed29e149a4a5ea6",
-                    "mixHash" : "0x844ddc18ea3c59f9969bff3621613d88e49445dd6c75597d626c30f5ef6884f7",
-                    "nonce" : "0x2609acaaaed42413",
+                    "hash" : "0x1dab955a7a06b24118cfd75a12166f05f3c33fa60dd4be3455a694bcf643add3",
+                    "mixHash" : "0xec7cffab43876a6bc8d7b1f38549fcafe60faa3ccbd407c9e9c675e5de34b4b6",
+                    "nonce" : "0x33aa6f4044848945",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "stateRoot" : "0x7ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0844ddc18ea3c59f9969bff3621613d88e49445dd6c75597d626c30f5ef6884f7882609acaaaed42413f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0ec7cffab43876a6bc8d7b1f38549fcafe60faa3ccbd407c9e9c675e5de34b4b68833aa6f4044848945f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50897f86899086c1fe09b17fbaf1d007d5ddc17f3c88e78b5ed29e149a4a5ea6",
+        "lastblockhash" : "0x1dab955a7a06b24118cfd75a12166f05f3c33fa60dd4be3455a694bcf643add3",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x29a2241af62cf149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x49b6e18d0afad199e1ed0469e0d02cabdf62a11910bb8ca6882977f01b157cca",
-                    "mixHash" : "0xc62eabe95faa83d07e1057f16a74abb184589dccc6ea0b0464bf3a093a45f9fd",
-                    "nonce" : "0x207525a93f5d7ff9",
+                    "hash" : "0xc97814ce2d927c5d913654865e1037bb9ccf7e6ac3b2574fd677f188985759b5",
+                    "mixHash" : "0xe99788fe2d829e05b6591557b72b5cd591dec42e4997bdac158efa62a73af281",
+                    "nonce" : "0xc720320e6356ed80",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "stateRoot" : "0x500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c62eabe95faa83d07e1057f16a74abb184589dccc6ea0b0464bf3a093a45f9fd88207525a93f5d7ff9f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0e99788fe2d829e05b6591557b72b5cd591dec42e4997bdac158efa62a73af28188c720320e6356ed80f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49b6e18d0afad199e1ed0469e0d02cabdf62a11910bb8ca6882977f01b157cca",
+        "lastblockhash" : "0xc97814ce2d927c5d913654865e1037bb9ccf7e6ac3b2574fd677f188985759b5",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x29a2241af62cf149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x81ac34ec0bc06635c382a1c50a48f9cb07a8acf5bd5d810a260aa11f812a8f95",
-                    "mixHash" : "0xd7fd076cb0d036c937f5ae4f927b422092e451e3e9958640c9cf2c21a7020acb",
-                    "nonce" : "0x15962bbf1be56bca",
+                    "hash" : "0x0f01e683c486313a739920512d94e92d3f037c6284e5c31841897f99246041c1",
+                    "mixHash" : "0xc5bbe2005d31ca58e756ae163a339b53d7aafec8e6be9b551748f586c9c721e5",
+                    "nonce" : "0x29b8441331f19fd3",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0d7fd076cb0d036c937f5ae4f927b422092e451e3e9958640c9cf2c21a7020acb8815962bbf1be56bcaf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c5bbe2005d31ca58e756ae163a339b53d7aafec8e6be9b551748f586c9c721e58829b8441331f19fd3f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81ac34ec0bc06635c382a1c50a48f9cb07a8acf5bd5d810a260aa11f812a8f95",
+        "lastblockhash" : "0x0f01e683c486313a739920512d94e92d3f037c6284e5c31841897f99246041c1",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x9e6cb709ef20ddd1ef636fe9b6fd9026f34f4da3819b08756f8461815c391bb7",
-                    "mixHash" : "0xc41a27eb3eaa9c0f8436c39e46ba456aae1b0b299acb18de54f0eafc1ded6293",
-                    "nonce" : "0x614dfa3b0b4fdafa",
+                    "hash" : "0x1b31479f9680f77f315199114cbbc5874106bad2519d740eddc10c702c8a3c78",
+                    "mixHash" : "0x56e30217c6c55f1b55ce5efe71965037be133d5d30ae8391a4024190856df6bd",
+                    "nonce" : "0xafdc74ca2cce86cb",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c41a27eb3eaa9c0f8436c39e46ba456aae1b0b299acb18de54f0eafc1ded629388614dfa3b0b4fdafaf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a056e30217c6c55f1b55ce5efe71965037be133d5d30ae8391a4024190856df6bd88afdc74ca2cce86cbf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e6cb709ef20ddd1ef636fe9b6fd9026f34f4da3819b08756f8461815c391bb7",
+        "lastblockhash" : "0x1b31479f9680f77f315199114cbbc5874106bad2519d740eddc10c702c8a3c78",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xf6caf481ffd6b76f4ab178609f8ccc2d22fbe555070f686bff8d6cc110eda74d",
-                    "mixHash" : "0x7d2dbd4b8dcf73954d9b304179f22266865a94247c5b09c50064a02d7b02aff7",
-                    "nonce" : "0x283025446f00e6cc",
+                    "hash" : "0x860156e47c88d9f1406e8952ff3c40be30dfa0afb8a4af6d7930d3c3bfdb6c5b",
+                    "mixHash" : "0xfb1637bf0eff24fa3ac1f4d325b4f2a41593b1e1a2e87a7d8d8ce8ac576455c9",
+                    "nonce" : "0xb1d14578c1485db3",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07d2dbd4b8dcf73954d9b304179f22266865a94247c5b09c50064a02d7b02aff788283025446f00e6ccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fb1637bf0eff24fa3ac1f4d325b4f2a41593b1e1a2e87a7d8d8ce8ac576455c988b1d14578c1485db3f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6caf481ffd6b76f4ab178609f8ccc2d22fbe555070f686bff8d6cc110eda74d",
+        "lastblockhash" : "0x860156e47c88d9f1406e8952ff3c40be30dfa0afb8a4af6d7930d3c3bfdb6c5b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x170947d12679c1787e35d38f5e784e6b234e86dd1e6f63ae956ebf6843439360",
-                    "mixHash" : "0x18c60d88e7eee3996b247fa36ff09d66f583361f55bc182672b0f5992167dca1",
-                    "nonce" : "0x30e0ebd6a0302a53",
+                    "hash" : "0x95dbf4f3e915713ee06a099b47b09e343b4ff6f77069e9b51eeac3d229c353dc",
+                    "mixHash" : "0x6eb4e21f23ab4631212855e9f3514a399456f8cac08c578fca6c8a1b4eda5c23",
+                    "nonce" : "0x65840a8c6b37c1bf",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a018c60d88e7eee3996b247fa36ff09d66f583361f55bc182672b0f5992167dca18830e0ebd6a0302a53f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a06eb4e21f23ab4631212855e9f3514a399456f8cac08c578fca6c8a1b4eda5c238865840a8c6b37c1bff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x170947d12679c1787e35d38f5e784e6b234e86dd1e6f63ae956ebf6843439360",
+        "lastblockhash" : "0x95dbf4f3e915713ee06a099b47b09e343b4ff6f77069e9b51eeac3d229c353dc",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
index 0c1b13d64..1499a13ce 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe54a9593b907c21501ed4dc6d6a1cd8723280af9bde1dd610dafc5e0dbca7d74",
-                    "mixHash" : "0xe78d1df0abb95bd1fa8723f82b77d6f3cd2e7e371cac842596ebae497aa6b16c",
-                    "nonce" : "0xbdcc61f463f3e377",
+                    "hash" : "0xf0aea97b17ccedc3246a42fd76f2dc9c9366870e7c4dc0824667a4d8825e9fc2",
+                    "mixHash" : "0x51bf5bde017eddcd4a1b06cfc8bb686af74b373bbb66a3e8100855f91cef0440",
+                    "nonce" : "0xf61a60a404a6bdb0",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0x0212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e78d1df0abb95bd1fa8723f82b77d6f3cd2e7e371cac842596ebae497aa6b16c88bdcc61f463f3e377c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a051bf5bde017eddcd4a1b06cfc8bb686af74b373bbb66a3e8100855f91cef044088f61a60a404a6bdb0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe54a9593b907c21501ed4dc6d6a1cd8723280af9bde1dd610dafc5e0dbca7d74",
+        "lastblockhash" : "0xf0aea97b17ccedc3246a42fd76f2dc9c9366870e7c4dc0824667a4d8825e9fc2",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x753f6d9f38eb82620aa949daa89b3f4566d871dc87151e69e5c638440a94a346",
-                    "mixHash" : "0x0aaaf6149fc951803ab9630caa8cd6069a658227f3c54f7d01e1a765d4e04b2f",
-                    "nonce" : "0x1c77a278a2ce499d",
+                    "hash" : "0xaef4949088623483f9b19137de9134531a45cd5191b1ef1d4dffbc664ee0b0c2",
+                    "mixHash" : "0x9cb347522e3c49b62b33524503431e5d1a345ac9ae5bb1fd285ccf5584a8c9c2",
+                    "nonce" : "0x4fcffd8ef02f92ed",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0x7c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00aaaf6149fc951803ab9630caa8cd6069a658227f3c54f7d01e1a765d4e04b2f881c77a278a2ce499dc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c068bacc799d098ee92cbc0591e2e69f87e3470ce03e20c62cdbdceac462aeba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09cb347522e3c49b62b33524503431e5d1a345ac9ae5bb1fd285ccf5584a8c9c2884fcffd8ef02f92edc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x753f6d9f38eb82620aa949daa89b3f4566d871dc87151e69e5c638440a94a346",
+        "lastblockhash" : "0xaef4949088623483f9b19137de9134531a45cd5191b1ef1d4dffbc664ee0b0c2",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa31496c7a5bdaa3cca61ea9cc14fffe428a310be3b282395f516d6224d7eff7c",
-                    "mixHash" : "0x8b1f9156be2fc34ee7278cac8154d830287f7b512a27518bc73c9495ae8b73d6",
-                    "nonce" : "0xac168a71414c036c",
+                    "hash" : "0x2103a403840acb9341ca174b42782451312ee475acaf0d55860773c743a50436",
+                    "mixHash" : "0x8dcebfd2f4df52a115e13dd9db17192e67ac373e73ecb254412861ee93d668cb",
+                    "nonce" : "0xa6dff892163bdc6d",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08b1f9156be2fc34ee7278cac8154d830287f7b512a27518bc73c9495ae8b73d688ac168a71414c036cc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08dcebfd2f4df52a115e13dd9db17192e67ac373e73ecb254412861ee93d668cb88a6dff892163bdc6dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa31496c7a5bdaa3cca61ea9cc14fffe428a310be3b282395f516d6224d7eff7c",
+        "lastblockhash" : "0x2103a403840acb9341ca174b42782451312ee475acaf0d55860773c743a50436",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x11a4ce52987d54d73ee3d4c743674d3a40949066c85ebc159a04c4777cf4982f",
-                    "mixHash" : "0x4a2c5b463b3d9292c69650d461f63f65eb6837fb5c6d303d47dc7eb22806b880",
-                    "nonce" : "0xe835db8666ecde56",
+                    "hash" : "0xdf3340439204659ef9de9a269877e17b243064b300fe5d66e8a9eac9bd09ec12",
+                    "mixHash" : "0x29df693a2269b90492be0710d1dadfb85d95db6f00bc129639ebd267ac5a613d",
+                    "nonce" : "0x23637ed839e2e983",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04a2c5b463b3d9292c69650d461f63f65eb6837fb5c6d303d47dc7eb22806b88088e835db8666ecde56c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a029df693a2269b90492be0710d1dadfb85d95db6f00bc129639ebd267ac5a613d8823637ed839e2e983c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11a4ce52987d54d73ee3d4c743674d3a40949066c85ebc159a04c4777cf4982f",
+        "lastblockhash" : "0xdf3340439204659ef9de9a269877e17b243064b300fe5d66e8a9eac9bd09ec12",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xcce26acefb450b805635f832b75e5b74b73dbcbc62c96ce7ae719a52777d0293",
-                    "mixHash" : "0xafc5b9fb972c25dee28028b1c61060114d4266deda0092fff20f279ed17a0c16",
-                    "nonce" : "0x60e4e0942e8be368",
+                    "hash" : "0x38d2d6510a4a237157f6c134ab06efb0c8012f5c56422f3d3dd77d53fa806681",
+                    "mixHash" : "0x35867eaade0cfa5f21dd73faf2555dbf46b0752fee59f6d6f60d3dfabca7573c",
+                    "nonce" : "0x6ccb7fff35cb3e44",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0afc5b9fb972c25dee28028b1c61060114d4266deda0092fff20f279ed17a0c168860e4e0942e8be368c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035867eaade0cfa5f21dd73faf2555dbf46b0752fee59f6d6f60d3dfabca7573c886ccb7fff35cb3e44c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcce26acefb450b805635f832b75e5b74b73dbcbc62c96ce7ae719a52777d0293",
+        "lastblockhash" : "0x38d2d6510a4a237157f6c134ab06efb0c8012f5c56422f3d3dd77d53fa806681",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6bcd143650d8772cdb97368952edf1e112abba90d1edb52b2b7ebd4f1e51db8a",
-                    "mixHash" : "0x5e8a59ed075944be33f66e75b42380569e9dd4faaca322f11c5523bade7061ed",
-                    "nonce" : "0x09c932fc0b62285e",
+                    "hash" : "0x795857cc35902d415b02017a1ff6cf51f07340fe2595d4aae15aa96d4fc7c336",
+                    "mixHash" : "0x43ab42b5484e3fb08b3f150fa804025bcbd3280b43d114d532dab0f3b559223c",
+                    "nonce" : "0x1631a800dd59c0b2",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05e8a59ed075944be33f66e75b42380569e9dd4faaca322f11c5523bade7061ed8809c932fc0b62285ec0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043ab42b5484e3fb08b3f150fa804025bcbd3280b43d114d532dab0f3b559223c881631a800dd59c0b2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bcd143650d8772cdb97368952edf1e112abba90d1edb52b2b7ebd4f1e51db8a",
+        "lastblockhash" : "0x795857cc35902d415b02017a1ff6cf51f07340fe2595d4aae15aa96d4fc7c336",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
index 6fca7811f..ca86d8764 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3b272604b7ae55691ac53d690249f0d0ed204bbb4bdbdcd1ed6405ee54c2185e",
-                    "mixHash" : "0x3d6ace248c63a1649e661abcc369d57be29c66e6d15d841de786b6fe8be92a1d",
-                    "nonce" : "0xcd7f1747706ec033",
+                    "hash" : "0xd6e055d6b838af310974c3ae77fd88cce84949239e6c58a60e8ac9342aff2bfe",
+                    "mixHash" : "0xef6832da4de94c605da90dbfd1549b035a3cc1efcffb3e2913dacb2df651d566",
+                    "nonce" : "0x96084a61e7a22921",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0x45318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03d6ace248c63a1649e661abcc369d57be29c66e6d15d841de786b6fe8be92a1d88cd7f1747706ec033c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ef6832da4de94c605da90dbfd1549b035a3cc1efcffb3e2913dacb2df651d5668896084a61e7a22921c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b272604b7ae55691ac53d690249f0d0ed204bbb4bdbdcd1ed6405ee54c2185e",
+        "lastblockhash" : "0xd6e055d6b838af310974c3ae77fd88cce84949239e6c58a60e8ac9342aff2bfe",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd3498a0ec709002f0f746cfee25d00c44f7b3ec258ee9dd1a19931ae2280def9",
-                    "mixHash" : "0x94f0c3f4fb179f250f54d18ad59f0e462625cef1f1c0e49b24fdeee665f46b8c",
-                    "nonce" : "0xba34bf4368ed4438",
+                    "hash" : "0xa9ca17324e520198f3b6e64684e82d45684dfced4b61cab70007a15161a5066e",
+                    "mixHash" : "0x2a718307adce0a2d819950794479c72304dde7c26fca8af7bf17102c7538e6eb",
+                    "nonce" : "0xd39aab0bff75a069",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0xecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a094f0c3f4fb179f250f54d18ad59f0e462625cef1f1c0e49b24fdeee665f46b8c88ba34bf4368ed4438c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecccc7d3a7b118766c9d9ae47663f70e1d71e25e1e1298a5c343c6ded93a05eea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02a718307adce0a2d819950794479c72304dde7c26fca8af7bf17102c7538e6eb88d39aab0bff75a069c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3498a0ec709002f0f746cfee25d00c44f7b3ec258ee9dd1a19931ae2280def9",
+        "lastblockhash" : "0xa9ca17324e520198f3b6e64684e82d45684dfced4b61cab70007a15161a5066e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xdbed07bd809d0681077ac7d71f31e87bf1aeb45640976d0f42edcfe93292b0ad",
-                    "mixHash" : "0xa7d0a207613f249e7680120eb1cb050a46a881527759d04968445fc4d7ee6046",
-                    "nonce" : "0x165908c307474825",
+                    "hash" : "0xc23b4eedca1d9a625587d468bc98677c411fc87439c057f7d5e5797a7282c68d",
+                    "mixHash" : "0xdaa8348beb95818519d40956aa3df45b0662850cbc5e79ebc129fa8f66908cbc",
+                    "nonce" : "0x2c279530b9b36d63",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a7d0a207613f249e7680120eb1cb050a46a881527759d04968445fc4d7ee604688165908c307474825c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0daa8348beb95818519d40956aa3df45b0662850cbc5e79ebc129fa8f66908cbc882c279530b9b36d63c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbed07bd809d0681077ac7d71f31e87bf1aeb45640976d0f42edcfe93292b0ad",
+        "lastblockhash" : "0xc23b4eedca1d9a625587d468bc98677c411fc87439c057f7d5e5797a7282c68d",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x663bd8be21ed5768fcbd102c7c925ccaadcbcea3e18d276a48ce282852cd7d6a",
-                    "mixHash" : "0x68a43a234ee10dcdc0017eda0e764d05af7f756e5a9390c7b8f429f2074a282c",
-                    "nonce" : "0x1f5642afae130997",
+                    "hash" : "0x3b71d6ce30f601a3b787dedcd20969efd006431a84a0e52a861f3cf2f88c5002",
+                    "mixHash" : "0x58dd1c687d9abb6952075c4324758373674fe5c1bed88681f288409be7491b31",
+                    "nonce" : "0x49669670097d7b9a",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a068a43a234ee10dcdc0017eda0e764d05af7f756e5a9390c7b8f429f2074a282c881f5642afae130997c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a058dd1c687d9abb6952075c4324758373674fe5c1bed88681f288409be7491b318849669670097d7b9ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x663bd8be21ed5768fcbd102c7c925ccaadcbcea3e18d276a48ce282852cd7d6a",
+        "lastblockhash" : "0x3b71d6ce30f601a3b787dedcd20969efd006431a84a0e52a861f3cf2f88c5002",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x031ad483916c8afbafd48cd7b83057b92fa4fdb3635744783c49837c2a69e91f",
-                    "mixHash" : "0x9db674bf6a2cfc30b0e052af27005053784a3b7fc5d87a1e69bc58a72ffe6486",
-                    "nonce" : "0xdf8f18183c50951b",
+                    "hash" : "0xd718c1ae531a6393a2a8a55a3bbc8fdc1d99db1f468111ba7a01c25ca9505565",
+                    "mixHash" : "0xa31f688401ee928d389d02e1473889714cf5be6a06771c4db3886d430280f04d",
+                    "nonce" : "0xe28f789e91ea1de5",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09db674bf6a2cfc30b0e052af27005053784a3b7fc5d87a1e69bc58a72ffe648688df8f18183c50951bc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a31f688401ee928d389d02e1473889714cf5be6a06771c4db3886d430280f04d88e28f789e91ea1de5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x031ad483916c8afbafd48cd7b83057b92fa4fdb3635744783c49837c2a69e91f",
+        "lastblockhash" : "0xd718c1ae531a6393a2a8a55a3bbc8fdc1d99db1f468111ba7a01c25ca9505565",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb5d19afdb7681aa4311a943696b4eb6a891b31a405acf256b26a8d74a77b5668",
-                    "mixHash" : "0x0773f5e37db8e98892ae08c26e64207a64946d1f946ab168075a9c209f87e11f",
-                    "nonce" : "0x9c8355371059e17a",
+                    "hash" : "0xbcd873613b3f4a1da1c4bc521b8b265709bbac586a2c25e65d144463badc8064",
+                    "mixHash" : "0xcbe4a35c96e29d00212a2f4936efe8f356342c89855cf437d0437e748fc160e4",
+                    "nonce" : "0xb396275c1705c256",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00773f5e37db8e98892ae08c26e64207a64946d1f946ab168075a9c209f87e11f889c8355371059e17ac0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cbe4a35c96e29d00212a2f4936efe8f356342c89855cf437d0437e748fc160e488b396275c1705c256c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5d19afdb7681aa4311a943696b4eb6a891b31a405acf256b26a8d74a77b5668",
+        "lastblockhash" : "0xbcd873613b3f4a1da1c4bc521b8b265709bbac586a2c25e65d144463badc8064",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
index 299903815..1c87d5b41 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4413785072453ff3db473323d402aa904c11950ad4a32240d2c50055665deeb7",
-                    "mixHash" : "0x6fc662af159d4add378c6d66d70920e1e629d7bef84679267ef82c4578386656",
-                    "nonce" : "0x6ffb05671c53945a",
+                    "hash" : "0x0623c1574519a8be2eae36828f374e0ea15968aba2e08ca3bd490b3683638bef",
+                    "mixHash" : "0xb4372a704b82f061b1a2802b504752aa5dba12c5d4f71b40366fb2efa6538e4f",
+                    "nonce" : "0x383fa41ebe6de161",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
+                    "stateRoot" : "0x400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06fc662af159d4add378c6d66d70920e1e629d7bef84679267ef82c4578386656886ffb05671c53945ac0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b4372a704b82f061b1a2802b504752aa5dba12c5d4f71b40366fb2efa6538e4f88383fa41ebe6de161c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4413785072453ff3db473323d402aa904c11950ad4a32240d2c50055665deeb7",
+        "lastblockhash" : "0x0623c1574519a8be2eae36828f374e0ea15968aba2e08ca3bd490b3683638bef",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput3Fail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5091f0414ca4ad1d37498e3037573ca96f6cec829123cfa787981f74d96a1ca9",
-                    "mixHash" : "0x784c3c615d0db89593c59de5a204442d366207f44e9830de5cb44fac567206a7",
-                    "nonce" : "0xc88deed46c048590",
+                    "hash" : "0xa87a4d2483bee653cf9b159b2388f2030a2d568555eaa6d3d24506c11a9916f5",
+                    "mixHash" : "0x2fb5aed32cc0efd7215bded85b4e4b093f2765ac906064fdda9b5e1aa3df4691",
+                    "nonce" : "0xf4b7f11248429db1",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
+                    "stateRoot" : "0xad2fa00b42c68336afe1f86dab2385be1cd82d78ef86b4c3f5e1bb60f9776a5e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0784c3c615d0db89593c59de5a204442d366207f44e9830de5cb44fac567206a788c88deed46c048590c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad2fa00b42c68336afe1f86dab2385be1cd82d78ef86b4c3f5e1bb60f9776a5ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02fb5aed32cc0efd7215bded85b4e4b093f2765ac906064fdda9b5e1aa3df469188f4b7f11248429db1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5091f0414ca4ad1d37498e3037573ca96f6cec829123cfa787981f74d96a1ca9",
+        "lastblockhash" : "0xa87a4d2483bee653cf9b159b2388f2030a2d568555eaa6d3d24506c11a9916f5",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput3Fail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb4f621f334e412c277f6e46688e31efe6ccb76432bdc1eb11840c7aeef5f6d07",
-                    "mixHash" : "0x5f37e2fda359b12c1379aa34c7bf25ac1c506ad1aca278fb72643c7429ea6996",
-                    "nonce" : "0x48267c50dada2fb4",
+                    "hash" : "0xc3b71c24b0035448db11bac9967a722660f4ac10484240af6085c1947fe15699",
+                    "mixHash" : "0xa82aeab9407b792c58a20036971594416c4499ef2649286985d698bf9ee36957",
+                    "nonce" : "0xdd3b0845e28a2d77",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05f37e2fda359b12c1379aa34c7bf25ac1c506ad1aca278fb72643c7429ea69968848267c50dada2fb4c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a82aeab9407b792c58a20036971594416c4499ef2649286985d698bf9ee3695788dd3b0845e28a2d77c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4f621f334e412c277f6e46688e31efe6ccb76432bdc1eb11840c7aeef5f6d07",
+        "lastblockhash" : "0xc3b71c24b0035448db11bac9967a722660f4ac10484240af6085c1947fe15699",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x58b951c810f52883c846956ab4eb4ea1a6d28a46d6b4ce33708a006d8f98bc45",
-                    "mixHash" : "0xbb7810c5f1ae3f45b02c4c544542164144667544c27bc439a431b86af767ba90",
-                    "nonce" : "0x134f5444e4a1f1e6",
+                    "hash" : "0xbad60f633bf9e815488a78761cee9bb9e6a416dd08665c3d277446fbe2424b0b",
+                    "mixHash" : "0x2b45b6fae02eaf321efc9926ceecae353df83be39a429b8f939d69362e14b415",
+                    "nonce" : "0x680c9d13b726ad45",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bb7810c5f1ae3f45b02c4c544542164144667544c27bc439a431b86af767ba9088134f5444e4a1f1e6c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02b45b6fae02eaf321efc9926ceecae353df83be39a429b8f939d69362e14b41588680c9d13b726ad45c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58b951c810f52883c846956ab4eb4ea1a6d28a46d6b4ce33708a006d8f98bc45",
+        "lastblockhash" : "0xbad60f633bf9e815488a78761cee9bb9e6a416dd08665c3d277446fbe2424b0b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf1d2873adaa26eb700eacfb6a880f4fcfac413dbf376c37a955c4328962c5d90",
-                    "mixHash" : "0x1a82379a2a9cd8585b29fab6df766f5284748a7bdb9b16ce8a75e44050c443e8",
-                    "nonce" : "0xabe16d7f436b28e0",
+                    "hash" : "0x453a4067defd79bc4483b2f4f3f6a1ac6b67c2fc2a3ca9790e91a590f8c3f5c5",
+                    "mixHash" : "0xf9447f4448097fdf024491f7023fcabb0ffbf05294a64b4236f7728b3d62a95f",
+                    "nonce" : "0x001d4e0048dd903a",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01a82379a2a9cd8585b29fab6df766f5284748a7bdb9b16ce8a75e44050c443e888abe16d7f436b28e0c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f9447f4448097fdf024491f7023fcabb0ffbf05294a64b4236f7728b3d62a95f88001d4e0048dd903ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1d2873adaa26eb700eacfb6a880f4fcfac413dbf376c37a955c4328962c5d90",
+        "lastblockhash" : "0x453a4067defd79bc4483b2f4f3f6a1ac6b67c2fc2a3ca9790e91a590f8c3f5c5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbc8029d66974dc5e232bc3cdca395eaf7bb00bd087256ba7a14ed23c410c3e53",
-                    "mixHash" : "0x07b2bd685c8fbb6d1070438bdf02d34079bdff31240929060b0d23ddfbff6eb7",
-                    "nonce" : "0x81561abf3c7fdd06",
+                    "hash" : "0x95794a4e7025351a990d41f5a3a157a2a20e9dc4d7ac8db0ff7f9bd8680ca627",
+                    "mixHash" : "0x6737ebbb5c214f008ce6d161ba9305881c60567ee392f974585eb45cf8cc94bd",
+                    "nonce" : "0x4a1b2158306d9824",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007b2bd685c8fbb6d1070438bdf02d34079bdff31240929060b0d23ddfbff6eb78881561abf3c7fdd06c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06737ebbb5c214f008ce6d161ba9305881c60567ee392f974585eb45cf8cc94bd884a1b2158306d9824c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc8029d66974dc5e232bc3cdca395eaf7bb00bd087256ba7a14ed23c410c3e53",
+        "lastblockhash" : "0x95794a4e7025351a990d41f5a3a157a2a20e9dc4d7ac8db0ff7f9bd8680ca627",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
index 956c6f7a6..a05b1041c 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x40e907e9e711c1db92751b28133c22b32e2174b39c5d9e05bc648b3df9915243",
-                    "mixHash" : "0x0946f763374057e29ceaee98194b1262d32c552986a1bfb52af944c87b9c61b3",
-                    "nonce" : "0xd03a7cf42bb1abb7",
+                    "hash" : "0xab60d76505ba0cd54c5b0660e3fea3066ec91dca9b089c83f34fa0be8f807fb7",
+                    "mixHash" : "0x65279fbf42738f718c935a9ff3ab0c145a81bb08ae8cf630885336265d957a39",
+                    "nonce" : "0x942734555597f644",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0x5bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00946f763374057e29ceaee98194b1262d32c552986a1bfb52af944c87b9c61b388d03a7cf42bb1abb7c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a065279fbf42738f718c935a9ff3ab0c145a81bb08ae8cf630885336265d957a3988942734555597f644c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x40e907e9e711c1db92751b28133c22b32e2174b39c5d9e05bc648b3df9915243",
+        "lastblockhash" : "0xab60d76505ba0cd54c5b0660e3fea3066ec91dca9b089c83f34fa0be8f807fb7",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput3_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe730fe2894b6a10b19c11fb4727487b049725a2a0bb15efa2a759786548cda82",
-                    "mixHash" : "0x47f0bf794d089db74e29d337f6634014b3da9dbc9bc0b658da51afb61415c540",
-                    "nonce" : "0x4dabdd8e08608f79",
+                    "hash" : "0x9fd83aa78ef49ee6efd27bb13f23b5edc09d760bc905da5ca1f5741857e2b474",
+                    "mixHash" : "0x176092c4f14ab8e37a4513b507ca8282d1d1f2f9599274fd3384d9c02e8b2fb4",
+                    "nonce" : "0xcc3a2a7890a5c898",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0xb6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047f0bf794d089db74e29d337f6634014b3da9dbc9bc0b658da51afb61415c540884dabdd8e08608f79c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6003d2c01ee74e7893ad02d7cb8a21679c517204dfa75229466c644334c04a9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0176092c4f14ab8e37a4513b507ca8282d1d1f2f9599274fd3384d9c02e8b2fb488cc3a2a7890a5c898c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe730fe2894b6a10b19c11fb4727487b049725a2a0bb15efa2a759786548cda82",
+        "lastblockhash" : "0x9fd83aa78ef49ee6efd27bb13f23b5edc09d760bc905da5ca1f5741857e2b474",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x70133023624df7b0e91f4dd52a0dc8802b86752851adb53d11427e937da78b30",
-                    "mixHash" : "0x3fc2de2d01f1dfbc41e2590c8b25d3e6bab599f392ed2c9f90afdc9d9b39ce6c",
-                    "nonce" : "0x01addd5113bd8e57",
+                    "hash" : "0x4df9479b3ad38cc9450bd2a33390a7fa8eaeb75e82e4cdb4a2c4b7a346f21e1a",
+                    "mixHash" : "0x48f4a5cae082eb71f2299d4e7e7a6446eed43b3e1f54271981ff370e786f1cb6",
+                    "nonce" : "0x6190159950c583ef",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03fc2de2d01f1dfbc41e2590c8b25d3e6bab599f392ed2c9f90afdc9d9b39ce6c8801addd5113bd8e57c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a048f4a5cae082eb71f2299d4e7e7a6446eed43b3e1f54271981ff370e786f1cb6886190159950c583efc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70133023624df7b0e91f4dd52a0dc8802b86752851adb53d11427e937da78b30",
+        "lastblockhash" : "0x4df9479b3ad38cc9450bd2a33390a7fa8eaeb75e82e4cdb4a2c4b7a346f21e1a",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa8c88b8d2b9f75329d78167ae17e9718ab08ada3aa2b8c6c45160ebbcf23c7e4",
-                    "mixHash" : "0x7a0acb52664dbfcaf6b1b04770858f56f329dc86671f4b4e1cef735f29ccfc53",
-                    "nonce" : "0x0f3cb7786b0afced",
+                    "hash" : "0xa5e4ec60942e1f030458e668c65e111859e44dfcbb30c8e4b6f10bbfc93d4490",
+                    "mixHash" : "0x5b122ffa6760307923eba8da19ee28ff542a61d000185d580326ac8a5b44e3c1",
+                    "nonce" : "0x2cca840ab72c55b6",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07a0acb52664dbfcaf6b1b04770858f56f329dc86671f4b4e1cef735f29ccfc53880f3cb7786b0afcedc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b122ffa6760307923eba8da19ee28ff542a61d000185d580326ac8a5b44e3c1882cca840ab72c55b6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8c88b8d2b9f75329d78167ae17e9718ab08ada3aa2b8c6c45160ebbcf23c7e4",
+        "lastblockhash" : "0xa5e4ec60942e1f030458e668c65e111859e44dfcbb30c8e4b6f10bbfc93d4490",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x03274acf704659ab0077c47623ee582e376ef4cab52ade3c3d6688242f9a7600",
-                    "mixHash" : "0x53b5e2df5c73199b6e88eaedde18e08732d10ab47eeff235280cdcf086bb0bf2",
-                    "nonce" : "0x5b862575b01745f1",
+                    "hash" : "0x518d9f8b5e28c2e57cbf714d2a8410c147dc87d3ae0c63bfc36a9fc06e4a5c51",
+                    "mixHash" : "0x3bc4fd8f3d9037aa9e6ffe82fef1db22eb038981318b2ae764ecb43c2523a84f",
+                    "nonce" : "0xad503d6194ca9dc8",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a053b5e2df5c73199b6e88eaedde18e08732d10ab47eeff235280cdcf086bb0bf2885b862575b01745f1c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03bc4fd8f3d9037aa9e6ffe82fef1db22eb038981318b2ae764ecb43c2523a84f88ad503d6194ca9dc8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03274acf704659ab0077c47623ee582e376ef4cab52ade3c3d6688242f9a7600",
+        "lastblockhash" : "0x518d9f8b5e28c2e57cbf714d2a8410c147dc87d3ae0c63bfc36a9fc06e4a5c51",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3e9328403598cd55359b01c0429513d57f5b2ecbbf992e2a7b84377ef1c007c0",
-                    "mixHash" : "0x515bc8194c5079a0e6ba5377638071d46b1f3670d461e60f246f859638b3089f",
-                    "nonce" : "0x779c86184642d18d",
+                    "hash" : "0xc05fb63b0d58a5a8966e2196a6f31666bcabab2fd850cc9f77bb2acd1db4c23a",
+                    "mixHash" : "0xf19018c2995d072d61a1d92f3c4777ce9de16059582d08056f8d002d809b5c1a",
+                    "nonce" : "0x99db6841a33c0faf",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0515bc8194c5079a0e6ba5377638071d46b1f3670d461e60f246f859638b3089f88779c86184642d18dc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f19018c2995d072d61a1d92f3c4777ce9de16059582d08056f8d002d809b5c1a8899db6841a33c0fafc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e9328403598cd55359b01c0429513d57f5b2ecbbf992e2a7b84377ef1c007c0",
+        "lastblockhash" : "0xc05fb63b0d58a5a8966e2196a6f31666bcabab2fd850cc9f77bb2acd1db4c23a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
index 56f736d26..58e90570c 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x892501816a13d296d611e325dffa39073400fbfa2a7091a029f28732fea11b23",
-                    "mixHash" : "0xf2d5acf9f70287967255c7654f48c1a8904af6d9c43b9d5f3744720475cf2692",
-                    "nonce" : "0xf6b3249ee4d530e2",
+                    "hash" : "0x937ff20588d69c211f59802f3640859dc622ca3017fdd007d550c02d66d725ac",
+                    "mixHash" : "0x56c7f9cd704f2fdbb0114873a2f11bb4542b8d09ebb96ecb5a12cc705e0b8c04",
+                    "nonce" : "0x199d4d3c08e16f44",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0xe2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f2d5acf9f70287967255c7654f48c1a8904af6d9c43b9d5f3744720475cf269288f6b3249ee4d530e2c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a056c7f9cd704f2fdbb0114873a2f11bb4542b8d09ebb96ecb5a12cc705e0b8c0488199d4d3c08e16f44c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x892501816a13d296d611e325dffa39073400fbfa2a7091a029f28732fea11b23",
+        "lastblockhash" : "0x937ff20588d69c211f59802f3640859dc622ca3017fdd007d550c02d66d725ac",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput3partialFail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc9bd4fff339cde7e75c043d5c4fbd90f83390961bbd01ea7a526b58ff8735ef6",
-                    "mixHash" : "0xd3e897c1ac80353c026e26fb812da1e785bf4a5bd9a707c61f15a5b5113410b2",
-                    "nonce" : "0xcd7d52e61afe3a4e",
+                    "hash" : "0xba41bbaf6fb11c9057fd539351e4ec47ace8efa70904f729e127c433b10a28a6",
+                    "mixHash" : "0xa62235a1fa2bfaf46f07a9f4d353a6a6535d3e35875dbb4169fdb07d980809b0",
+                    "nonce" : "0x5442ccb5f261c5f6",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0xe893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d3e897c1ac80353c026e26fb812da1e785bf4a5bd9a707c61f15a5b5113410b288cd7d52e61afe3a4ec0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e893c90f6397a5a5184908f5cca0c5d6825ec606b7d6ef30ab7fa509b178a466a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a62235a1fa2bfaf46f07a9f4d353a6a6535d3e35875dbb4169fdb07d980809b0885442ccb5f261c5f6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9bd4fff339cde7e75c043d5c4fbd90f83390961bbd01ea7a526b58ff8735ef6",
+        "lastblockhash" : "0xba41bbaf6fb11c9057fd539351e4ec47ace8efa70904f729e127c433b10a28a6",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput3partialFail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5cb015a1f39a664014e66968105ccede2d554283b4906fb5d32c94f91d197493",
-                    "mixHash" : "0x68c3fe2be72b9fc9c483d4352cd5731492aee28bac487c6e6eb79069c614be7b",
-                    "nonce" : "0x698bca1a4647967a",
+                    "hash" : "0xe67449f653497377ecd436f40ac7d9b4f9719b3f486179894da85dcf1f3e93a9",
+                    "mixHash" : "0x0f88ce67de5983f59c9f2a830ad77cd072aef0bf356bdf890950162c941ecc2b",
+                    "nonce" : "0xe5e34ea65945cad9",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a068c3fe2be72b9fc9c483d4352cd5731492aee28bac487c6e6eb79069c614be7b88698bca1a4647967ac0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00f88ce67de5983f59c9f2a830ad77cd072aef0bf356bdf890950162c941ecc2b88e5e34ea65945cad9c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5cb015a1f39a664014e66968105ccede2d554283b4906fb5d32c94f91d197493",
+        "lastblockhash" : "0xe67449f653497377ecd436f40ac7d9b4f9719b3f486179894da85dcf1f3e93a9",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9650d9e36b74cbddb8a2b0863dae5c2955629e4c2071c69d8e3146fde97b13b3",
-                    "mixHash" : "0x3c2c35c41e967311cbdb652912104f12a5ff3540799c220edab40df20f5ab523",
-                    "nonce" : "0xaa76001818ac7eb0",
+                    "hash" : "0x348ba7d14b96cc35ddb02447995b14e7bcea3f39c3cc5ae470aaa329404603b1",
+                    "mixHash" : "0x2a607db6124942237b9e3618bc687acbdf18d77ee70e74fc6eb33d85d3c61520",
+                    "nonce" : "0x1da316035fa071d4",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03c2c35c41e967311cbdb652912104f12a5ff3540799c220edab40df20f5ab52388aa76001818ac7eb0c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02a607db6124942237b9e3618bc687acbdf18d77ee70e74fc6eb33d85d3c61520881da316035fa071d4c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9650d9e36b74cbddb8a2b0863dae5c2955629e4c2071c69d8e3146fde97b13b3",
+        "lastblockhash" : "0x348ba7d14b96cc35ddb02447995b14e7bcea3f39c3cc5ae470aaa329404603b1",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc37012a0a9d76549f5604d71fdcc4cede92bccefa05f54cd4308b7ac4b0cdd22",
-                    "mixHash" : "0xd5fbdc07885e35d38d81f02182f3a52840971c9298c57ecb3f80e272678e4407",
-                    "nonce" : "0x451a5d34ac114162",
+                    "hash" : "0x6c8544d74aae08967bdeb153850d5a20298c20f7f29ae31c73da24c140c19713",
+                    "mixHash" : "0x6b116499beadce311eaece71b722676f6c0f37e16cf481156abd619ccbb3c52b",
+                    "nonce" : "0xd8938bdc7891fb71",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d5fbdc07885e35d38d81f02182f3a52840971c9298c57ecb3f80e272678e440788451a5d34ac114162c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06b116499beadce311eaece71b722676f6c0f37e16cf481156abd619ccbb3c52b88d8938bdc7891fb71c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc37012a0a9d76549f5604d71fdcc4cede92bccefa05f54cd4308b7ac4b0cdd22",
+        "lastblockhash" : "0x6c8544d74aae08967bdeb153850d5a20298c20f7f29ae31c73da24c140c19713",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf748763180fc70f8cefd7a5456cdc9fd3ce0c30f7be96a6c5068b362cc326872",
-                    "mixHash" : "0x4ca396c61c6990f251366063812e73a38351bb3ae4cc9a3a9fdbff398d502e0c",
-                    "nonce" : "0x45eeac8aad7e9ae3",
+                    "hash" : "0xcbb7719dea331f80e59803b33db90319f1b0d85a1db40acfb24272d133654157",
+                    "mixHash" : "0x3ca883c82ffa1e4318b40e7482b35333fac89ae2f8772747683713d9ec4a04bc",
+                    "nonce" : "0x704164c49b1eaa15",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04ca396c61c6990f251366063812e73a38351bb3ae4cc9a3a9fdbff398d502e0c8845eeac8aad7e9ae3c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03ca883c82ffa1e4318b40e7482b35333fac89ae2f8772747683713d9ec4a04bc88704164c49b1eaa15c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf748763180fc70f8cefd7a5456cdc9fd3ce0c30f7be96a6c5068b362cc326872",
+        "lastblockhash" : "0xcbb7719dea331f80e59803b33db90319f1b0d85a1db40acfb24272d133654157",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
index 2faf5fa9f..2dc5031c1 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe311a96a57ad27fbb679efb25c6a1d5c80e7c6baff394b42cfd25fbb3f6f7dd5",
-                    "mixHash" : "0xf67d3cf3d4963077b66d93a3e55fd6b06020de2022d5f55565c7ec76c0eb5672",
-                    "nonce" : "0xb92121861c54dba0",
+                    "hash" : "0x804312321613f38a3dfe245118364bce39697d8ed8e51aaf066703df554d8f22",
+                    "mixHash" : "0xcf8b71957592823de355c0867480c517cb75120c3171dc69fcaafb12426f1aca",
+                    "nonce" : "0xff9238740733bb92",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0x1af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f67d3cf3d4963077b66d93a3e55fd6b06020de2022d5f55565c7ec76c0eb567288b92121861c54dba0c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cf8b71957592823de355c0867480c517cb75120c3171dc69fcaafb12426f1aca88ff9238740733bb92c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,16 +51,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe311a96a57ad27fbb679efb25c6a1d5c80e7c6baff394b42cfd25fbb3f6f7dd5",
+        "lastblockhash" : "0x804312321613f38a3dfe245118364bce39697d8ed8e51aaf066703df554d8f22",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -69,7 +62,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -117,7 +110,7 @@
     "callcodeOutput3partial_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +122,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf38c9594aa91f3aed8a0321dbf8d6a3b80f9bf19ab208b2f24f304dd11a7d4da",
-                    "mixHash" : "0x2005cbfca0aa8be477b4de28c1e9ffcb7737c845a4d97dd8013bd95330288281",
-                    "nonce" : "0xff6d6e815c36b1ab",
+                    "hash" : "0xcf6d84c92f9190a090d63a8d9ac05ac454da39dc87095fdb7f5e1bcfa4d5aad0",
+                    "mixHash" : "0x994098bb9bc8a9c269a5f33c92ec4d4f18108144da4ba81017ca1156fd4fc729",
+                    "nonce" : "0x79c029373498a3bd",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0xaf67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19fae",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02005cbfca0aa8be477b4de28c1e9ffcb7737c845a4d97dd8013bd9533028828188ff6d6e815c36b1abc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af67dd2c08eb95b3196292d9137020e57a22ad3e9301191205709b34c0c19faea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0994098bb9bc8a9c269a5f33c92ec4d4f18108144da4ba81017ca1156fd4fc7298879c029373498a3bdc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -166,7 +159,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf38c9594aa91f3aed8a0321dbf8d6a3b80f9bf19ab208b2f24f304dd11a7d4da",
+        "lastblockhash" : "0xcf6d84c92f9190a090d63a8d9ac05ac454da39dc87095fdb7f5e1bcfa4d5aad0",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -184,7 +177,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
+                "balance" : "0x29a2241af62c0000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -232,7 +225,7 @@
     "callcodeOutput3partial_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -244,9 +237,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0d2dc11b082fdd8d6d95385f88e9d06cc36d1ed94108d3b8d1183a87eb6118d4",
-                    "mixHash" : "0xab84774fd7250a9ff571cc2cc70640cb03c38611d0e7953c282287ae402c5cb7",
-                    "nonce" : "0x70b6abe995220fd2",
+                    "hash" : "0xc83452d910b51040aa7f19a4eb3e8d6a6b70589e8115fbbe4df55320cc8e818e",
+                    "mixHash" : "0xd16d220c1245486328cc9ff86daa9930c9572fff062609db7eac8059d914349f",
+                    "nonce" : "0x49e5ddd214f82961",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -255,7 +248,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ab84774fd7250a9ff571cc2cc70640cb03c38611d0e7953c282287ae402c5cb78870b6abe995220fd2c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d16d220c1245486328cc9ff86daa9930c9572fff062609db7eac8059d914349f8849e5ddd214f82961c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -281,7 +274,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d2dc11b082fdd8d6d95385f88e9d06cc36d1ed94108d3b8d1183a87eb6118d4",
+        "lastblockhash" : "0xc83452d910b51040aa7f19a4eb3e8d6a6b70589e8115fbbe4df55320cc8e818e",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -340,7 +333,7 @@
     "callcodeOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,9 +345,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x037fa5c381928211358f81c4c977680ca97f32a8526087d9c90b790d83485dc7",
-                    "mixHash" : "0x052af000fb14b6fea813b4ef81207af041eb2fffcd64b40689602fd076a7625c",
-                    "nonce" : "0xa002e08907263e30",
+                    "hash" : "0xc6e79d232e2b43117cfd640c6482f3d2cc4697201be0bde710bbe2a658b0978b",
+                    "mixHash" : "0x0186357642e47da9d644a20fd7d8bccc2bd483ea9c64e3b030c92a149ac49b72",
+                    "nonce" : "0xe7dca53645496901",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -363,7 +356,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0052af000fb14b6fea813b4ef81207af041eb2fffcd64b40689602fd076a7625c88a002e08907263e30c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00186357642e47da9d644a20fd7d8bccc2bd483ea9c64e3b030c92a149ac49b7288e7dca53645496901c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -389,7 +382,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x037fa5c381928211358f81c4c977680ca97f32a8526087d9c90b790d83485dc7",
+        "lastblockhash" : "0xc6e79d232e2b43117cfd640c6482f3d2cc4697201be0bde710bbe2a658b0978b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -448,7 +441,7 @@
     "callcodeOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6057d8da323180d3135c5d681485672ab027876f15c59db20e3cb6467a2659a6",
-                    "mixHash" : "0x7d6f9dbcb5ddff39b2f4eef9237531bedaa5f2053d18e1f8b5d2f815b9b70802",
-                    "nonce" : "0x9339c80b307a7d6d",
+                    "hash" : "0x9dce97086826f88854119357e7774cbbac2c641a5f466342fb0b9d1329475d94",
+                    "mixHash" : "0xea1c57901107658da4f2c361d91d44b5ee1d00992e0761e8659b3df0961f1999",
+                    "nonce" : "0x3bd1a547a0fa23d2",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07d6f9dbcb5ddff39b2f4eef9237531bedaa5f2053d18e1f8b5d2f815b9b70802889339c80b307a7d6dc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ea1c57901107658da4f2c361d91d44b5ee1d00992e0761e8659b3df0961f1999883bd1a547a0fa23d2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -497,7 +490,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6057d8da323180d3135c5d681485672ab027876f15c59db20e3cb6467a2659a6",
+        "lastblockhash" : "0x9dce97086826f88854119357e7774cbbac2c641a5f466342fb0b9d1329475d94",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -556,7 +549,7 @@
     "callcodeOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -568,9 +561,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4a77e7821f7f43cb479b0b55e30a99bed8d75ab4f9baf022ebe4444c67a85c77",
-                    "mixHash" : "0x3c396dc85fcc482714c76f99473167d1ccf7a94b62aae323a0bd8ba02dbecb62",
-                    "nonce" : "0x93b5adce3bea617a",
+                    "hash" : "0xd5f1f9f1f33d83aec697a09796f8dca1304e5983c8d3606e092eff94554dfa43",
+                    "mixHash" : "0xda8b1dbd2e3eca3110ae1a7d7cb963ccfefcbc57963e96780e23dea0383a7700",
+                    "nonce" : "0x76849f622db25738",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -579,7 +572,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03c396dc85fcc482714c76f99473167d1ccf7a94b62aae323a0bd8ba02dbecb628893b5adce3bea617ac0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0da8b1dbd2e3eca3110ae1a7d7cb963ccfefcbc57963e96780e23dea0383a77008876849f622db25738c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a77e7821f7f43cb479b0b55e30a99bed8d75ab4f9baf022ebe4444c67a85c77",
+        "lastblockhash" : "0xd5f1f9f1f33d83aec697a09796f8dca1304e5983c8d3606e092eff94554dfa43",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
index c97b3d434..c5cf57e9e 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xe9162b77375741e59478f75430bbbb396d7bf3efecf5aa39a194b2941707751e",
-                    "mixHash" : "0xb7c193833c873803a24f198b781a154ffe2c5958eea62cb3b96668bda91e3900",
-                    "nonce" : "0x4be0479e673a99cc",
+                    "hash" : "0x7bc3fb4f9b7f003f9ae10bea0021e99450d85da4d06f3dac4b0b3edb1915793b",
+                    "mixHash" : "0xc9dfff344668ebbb31a0fb2558d8efcfa9a55efd9c6765304ebad46540fdd1fe",
+                    "nonce" : "0x7ba1cae924989986",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "stateRoot" : "0x7ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0b7c193833c873803a24f198b781a154ffe2c5958eea62cb3b96668bda91e3900884be0479e673a99ccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c9dfff344668ebbb31a0fb2558d8efcfa9a55efd9c6765304ebad46540fdd1fe887ba1cae924989986f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9162b77375741e59478f75430bbbb396d7bf3efecf5aa39a194b2941707751e",
+        "lastblockhash" : "0x7bc3fb4f9b7f003f9ae10bea0021e99450d85da4d06f3dac4b0b3edb1915793b",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x29a2241af62cf149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x47e159edf0ddbedf97003aa4b1c8486bc01435a2dca4d6d07f3b3c92b8ff6cc7",
-                    "mixHash" : "0x50ffa0b58fe56deb12931bc6533c4fa0dedebc26e09958cd9691354f302c6e96",
-                    "nonce" : "0xbd4e1a72315fa518",
+                    "hash" : "0x1af374461ff48b1931e000c56c3c0b93144212e3eff8b58d78e44480ef637496",
+                    "mixHash" : "0x0b014a6d52a397018f49920b8916e5fb163afee796cf0de37d3c3a49654c0df5",
+                    "nonce" : "0x67d3cea444d501f0",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "stateRoot" : "0x500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a050ffa0b58fe56deb12931bc6533c4fa0dedebc26e09958cd9691354f302c6e9688bd4e1a72315fa518f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0500558d0462adb9431982bc7e431d2c767ac3e9f53a1135dce43b8f5c65aa7e2a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a00b014a6d52a397018f49920b8916e5fb163afee796cf0de37d3c3a49654c0df58867d3cea444d501f0f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47e159edf0ddbedf97003aa4b1c8486bc01435a2dca4d6d07f3b3c92b8ff6cc7",
+        "lastblockhash" : "0x1af374461ff48b1931e000c56c3c0b93144212e3eff8b58d78e44480ef637496",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x29a2241af62cf149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x65dd213c0bad55fd8dfad9b2d43533f03351b6dcc8d3d018d236ede8e98619ee",
-                    "mixHash" : "0x3e03dc44d1be8133665b15920311f360592ed0eb02270915ef11ca7defeced57",
-                    "nonce" : "0xa3af7a1b8158bc59",
+                    "hash" : "0x563c4978c8c0a7f4bc3d6e1a371ac33e47d55c490b75b13510c6110134f9d4de",
+                    "mixHash" : "0xf771d24c568a63e5fcfcc0227b08d2d050380250a277826d95c0837ac41718c5",
+                    "nonce" : "0x7e9eb40621b9b9db",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a03e03dc44d1be8133665b15920311f360592ed0eb02270915ef11ca7defeced5788a3af7a1b8158bc59f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0f771d24c568a63e5fcfcc0227b08d2d050380250a277826d95c0837ac41718c5887e9eb40621b9b9dbf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65dd213c0bad55fd8dfad9b2d43533f03351b6dcc8d3d018d236ede8e98619ee",
+        "lastblockhash" : "0x563c4978c8c0a7f4bc3d6e1a371ac33e47d55c490b75b13510c6110134f9d4de",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x8422c09e13f47d089db6701a82c4694ad0a180696c82f784f2bccea13c0551a9",
-                    "mixHash" : "0x97f320c4ea66f8c961157d99f54981e28592ab00226ebaa436e58c6aa8e2f7e0",
-                    "nonce" : "0xb2f8412d980383bd",
+                    "hash" : "0x765cb7714233ec4ae5bd6bcda4fd79ee60cb72eb1019ec9aa575f1a431049838",
+                    "mixHash" : "0x2768190833c72410a5b4eaec8bfa05461f03b88f9b5278ad3ce157099f174c90",
+                    "nonce" : "0xe0392e13b53149b8",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a097f320c4ea66f8c961157d99f54981e28592ab00226ebaa436e58c6aa8e2f7e088b2f8412d980383bdf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a02768190833c72410a5b4eaec8bfa05461f03b88f9b5278ad3ce157099f174c9088e0392e13b53149b8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8422c09e13f47d089db6701a82c4694ad0a180696c82f784f2bccea13c0551a9",
+        "lastblockhash" : "0x765cb7714233ec4ae5bd6bcda4fd79ee60cb72eb1019ec9aa575f1a431049838",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x203957fd8049be659449cbc6f31fa7e7ecdb1d4069563e7561f4a2353ea17934",
-                    "mixHash" : "0x3871cf480374d0c715fcddf416863aed67720b96aec982a657569f43f6a14d4a",
-                    "nonce" : "0x108f2ed14ae9ca65",
+                    "hash" : "0x40817cd67f53d72b74db6961a3e2e7b57a1da9cec863ace6dee2b104512a2a18",
+                    "mixHash" : "0xecad46d71791de0e77fd3858cef4ef8c5bc6b4ef2c377ac120e2ce291ecee877",
+                    "nonce" : "0xa102814a9eefbe1e",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a03871cf480374d0c715fcddf416863aed67720b96aec982a657569f43f6a14d4a88108f2ed14ae9ca65f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ecad46d71791de0e77fd3858cef4ef8c5bc6b4ef2c377ac120e2ce291ecee87788a102814a9eefbe1ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x203957fd8049be659449cbc6f31fa7e7ecdb1d4069563e7561f4a2353ea17934",
+        "lastblockhash" : "0x40817cd67f53d72b74db6961a3e2e7b57a1da9cec863ace6dee2b104512a2a18",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xdb0f82edf1b758cff8e2ed7a35e4a53a6b24fd7057291686bbe01c1c5675d970",
-                    "mixHash" : "0x01ecb43f13aa0a9e464264a119a8f660715de2da28ddb401744d217b5bdff217",
-                    "nonce" : "0xa0e0d41485c87e1f",
+                    "hash" : "0x872953962a8a10b27182739dceb0ae5a5b384cc592dc1eb8460f2ff7f46854bc",
+                    "mixHash" : "0x47f88730d68d2b2cbbb1eb3126ffd4d147c29743adbaeedbbede23e773be276d",
+                    "nonce" : "0xb6e7d5b47d58123e",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a001ecb43f13aa0a9e464264a119a8f660715de2da28ddb401744d217b5bdff21788a0e0d41485c87e1ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a047f88730d68d2b2cbbb1eb3126ffd4d147c29743adbaeedbbede23e773be276d88b6e7d5b47d58123ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb0f82edf1b758cff8e2ed7a35e4a53a6b24fd7057291686bbe01c1c5675d970",
+        "lastblockhash" : "0x872953962a8a10b27182739dceb0ae5a5b384cc592dc1eb8460f2ff7f46854bc",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
index 83ac1071c..64f1f6a62 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
@@ -2,7 +2,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x3bb536d32d96ec5bf64a4e7d07831903d662e88b4082053c84643e981f4656d7",
-                    "mixHash" : "0x93cd2b42cf5ea77810c284294b6aa714d89dc7f03c64ee083774eef2d1595084",
-                    "nonce" : "0x6f12c2ad1a09f629",
+                    "hash" : "0x20e6a5afd77c18c2826715b0dd588f153061db71c1138594c705572942fe3770",
+                    "mixHash" : "0x35588ce71d3ca8a467543f83180e4353787b1a6d2e9375afe3bef53c8849329b",
+                    "nonce" : "0x946e34e2578eba09",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
-                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
+                    "stateRoot" : "0x2b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a093cd2b42cf5ea77810c284294b6aa714d89dc7f03c64ee083774eef2d1595084886f12c2ad1a09f629f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a035588ce71d3ca8a467543f83180e4353787b1a6d2e9375afe3bef53c8849329b88946e34e2578eba09f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bb536d32d96ec5bf64a4e7d07831903d662e88b4082053c84643e981f4656d7",
+        "lastblockhash" : "0x20e6a5afd77c18c2826715b0dd588f153061db71c1138594c705572942fe3770",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
@@ -89,7 +82,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c0",
+                "balance" : "0x29a2241af62d04c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x6076281b4965b9efb889480140311c0cf293c6a337ac0eedb3bb1fd7b5b1e294",
-                    "mixHash" : "0x3291f687cf6265a93e364fb41fe18c51c2a685389e45be8b2cf8b06cccc3c0e0",
-                    "nonce" : "0x21df9acbd393354b",
+                    "hash" : "0xe649a477e499c631227d19f9ee07b82d60fb690de602b609b0b9c76209f8742c",
+                    "mixHash" : "0xc0df63873b163b8121e32f8274b2956bdca928a0073ab291238e4fd5abb8e462",
+                    "nonce" : "0x6c6349ff9acad72b",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
-                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
+                    "stateRoot" : "0x2e60d9a06d6f6f86590c22ba77486437f192083ec8e71f00b55c682f0be63330",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a03291f687cf6265a93e364fb41fe18c51c2a685389e45be8b2cf8b06cccc3c0e08821df9acbd393354bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e60d9a06d6f6f86590c22ba77486437f192083ec8e71f00b55c682f0be63330a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0c0df63873b163b8121e32f8274b2956bdca928a0073ab291238e4fd5abb8e462886c6349ff9acad72bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6076281b4965b9efb889480140311c0cf293c6a337ac0eedb3bb1fd7b5b1e294",
+        "lastblockhash" : "0xe649a477e499c631227d19f9ee07b82d60fb690de602b609b0b9c76209f8742c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -217,7 +210,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c0",
+                "balance" : "0x29a2241af62d04c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0xab1c52a7fd2d07bbcda3a46615d3bb80dda3962d059372b644c9a322281efcf4",
-                    "mixHash" : "0xd15f0837a1db8cc70bcf33067195c4e333ad80ddcdb84b837a8b14ba7ca0acb0",
-                    "nonce" : "0x4fc2355bc4ac8213",
+                    "hash" : "0x57016a29fb68d1a1522825ae775cfe877f5e85343928210963da63060f3d20ce",
+                    "mixHash" : "0x0705c4f1d2c975691341baebdbbe34a9459deb394b333ccd464866f838dc3f99",
+                    "nonce" : "0xb7721baa360894a9",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0d15f0837a1db8cc70bcf33067195c4e333ad80ddcdb84b837a8b14ba7ca0acb0884fc2355bc4ac8213f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a00705c4f1d2c975691341baebdbbe34a9459deb394b333ccd464866f838dc3f9988b7721baa360894a9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab1c52a7fd2d07bbcda3a46615d3bb80dda3962d059372b644c9a322281efcf4",
+        "lastblockhash" : "0x57016a29fb68d1a1522825ae775cfe877f5e85343928210963da63060f3d20ce",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -379,7 +372,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0xa367b9aef2edb6cfbf2bd26e7b6a9c0feee12035c44418cfe685061257e58ef3",
-                    "mixHash" : "0xb2694c105ec4762ffa6e4c7d700e6f8d5956eb0d1d7733cc5434ef135d25d457",
-                    "nonce" : "0x66d52574e4d55d4a",
+                    "hash" : "0x0f4ef029b96ac72e0a09879a771a0322bdd901ab2453d84f0d44e190f5ee55b7",
+                    "mixHash" : "0x3731f0daca48cd8746dfdd9200a0151a9d686b02b245fc08adddbfe7f3c43dc6",
+                    "nonce" : "0x7c2b715f48656753",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0b2694c105ec4762ffa6e4c7d700e6f8d5956eb0d1d7733cc5434ef135d25d4578866d52574e4d55d4af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a03731f0daca48cd8746dfdd9200a0151a9d686b02b245fc08adddbfe7f3c43dc6887c2b715f48656753f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa367b9aef2edb6cfbf2bd26e7b6a9c0feee12035c44418cfe685061257e58ef3",
+        "lastblockhash" : "0x0f4ef029b96ac72e0a09879a771a0322bdd901ab2453d84f0d44e190f5ee55b7",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -500,7 +493,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x0ebc9cbba2a537810a3d9d10ef77d36988e21a9dbf7488410ae84375578ded27",
-                    "mixHash" : "0xd2afaec50dead832eba17c7f7b0bfe119abb173842ab743c15aef0187a93ccf1",
-                    "nonce" : "0x89fd01027ab3fb39",
+                    "hash" : "0xb0e03edc55d4569d15dcda63917a9184283095c8971c452d8c3cc76ef8b32df8",
+                    "mixHash" : "0x24d3903a1807f2e369706d972db32eb08258d37a16c08ddc6875ac9114ed78a1",
+                    "nonce" : "0x707aa92db95c6cac",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0d2afaec50dead832eba17c7f7b0bfe119abb173842ab743c15aef0187a93ccf18889fd01027ab3fb39f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a024d3903a1807f2e369706d972db32eb08258d37a16c08ddc6875ac9114ed78a188707aa92db95c6cacf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ebc9cbba2a537810a3d9d10ef77d36988e21a9dbf7488410ae84375578ded27",
+        "lastblockhash" : "0xb0e03edc55d4569d15dcda63917a9184283095c8971c452d8c3cc76ef8b32df8",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -619,7 +612,7 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01022c",
-                    "hash" : "0x537b872a58ad00eb607df4325c34c51191fa3ccb332f3a8a706e9de225aea178",
-                    "mixHash" : "0x561c486fd757093eba733130631ea3cca4872760db6108abe87bf8a3c87540ee",
-                    "nonce" : "0xfef12b411d92e22c",
+                    "hash" : "0x3d8e62b5136ee9648eb079b8a9b96df434022c76e9240e019cba01d4389b377d",
+                    "mixHash" : "0x0a47f32349590686ec952ed32d086069bcc78516acb6bf2860355bf16bd91356",
+                    "nonce" : "0x05add5229c5e7da8",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a0561c486fd757093eba733130631ea3cca4872760db6108abe87bf8a3c87540ee88fef12b411d92e22cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a00a47f32349590686ec952ed32d086069bcc78516acb6bf2860355bf16bd913568805add5229c5e7da8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x537b872a58ad00eb607df4325c34c51191fa3ccb332f3a8a706e9de225aea178",
+        "lastblockhash" : "0x3d8e62b5136ee9648eb079b8a9b96df434022c76e9240e019cba01d4389b377d",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
index b6a4eb2e6..1240d4e78 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x7188fb5ec31ad5491f2d678054c627c9b1342c67f2dfe25ddf756440538d6280",
-                    "mixHash" : "0x020ee33eed0515e396a621710ac7a4182736a284bb2714d8271d9200e186f3a6",
-                    "nonce" : "0x2e85011450a9d783",
+                    "hash" : "0xbb5a333145dc5c5189296e79af56d68476877786b36da7368415baec1a534bc7",
+                    "mixHash" : "0xec780831c769c7f24ff781b952e1d735b54246e30351ba8b4c2e2769a8332f3d",
+                    "nonce" : "0x467c93526801a0d1",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
-                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
+                    "stateRoot" : "0x596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0020ee33eed0515e396a621710ac7a4182736a284bb2714d8271d9200e186f3a6882e85011450a9d783f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0ec780831c769c7f24ff781b952e1d735b54246e30351ba8b4c2e2769a8332f3d88467c93526801a0d1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7188fb5ec31ad5491f2d678054c627c9b1342c67f2dfe25ddf756440538d6280",
+        "lastblockhash" : "0xbb5a333145dc5c5189296e79af56d68476877786b36da7368415baec1a534bc7",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f131",
+                "balance" : "0x29a2241af62cf131",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x844db2883374b0cb2c9eb06db629cca41bdb39a99ef3aa821879e78accece471",
-                    "mixHash" : "0xfa479bb9025a548ca800089697b989ad50a0220fcf8fc1c52ed66019641f9840",
-                    "nonce" : "0x154872a5586052b8",
+                    "hash" : "0x5466b83d124edd33679b19788718e67518b25e5bd12ddc5e103f6e343c1120fa",
+                    "mixHash" : "0x1da1daf6b332787f2b6860c1ec2f6724a930ac947906536933394a5aa286d67d",
+                    "nonce" : "0x60683852ca495d61",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
-                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
+                    "stateRoot" : "0x9e92006fe17bad6a64f3a6c60cd0488fe54782a0209902cee1fad8dfd27eb488",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0fa479bb9025a548ca800089697b989ad50a0220fcf8fc1c52ed66019641f984088154872a5586052b8f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e92006fe17bad6a64f3a6c60cd0488fe54782a0209902cee1fad8dfd27eb488a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a01da1daf6b332787f2b6860c1ec2f6724a930ac947906536933394a5aa286d67d8860683852ca495d61f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x844db2883374b0cb2c9eb06db629cca41bdb39a99ef3aa821879e78accece471",
+        "lastblockhash" : "0x5466b83d124edd33679b19788718e67518b25e5bd12ddc5e103f6e343c1120fa",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f131",
+                "balance" : "0x29a2241af62cf131",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x86e7f44bb31dde9220ddb3654367bf6a98a61471cf72b6ebae53f04c1fa9b020",
-                    "mixHash" : "0x132148b8dbb4160b78571d4343a97df8b90a5815538fec9d607f278157bf6aaa",
-                    "nonce" : "0x4520b2705b854d0e",
+                    "hash" : "0xa16d657f3cc8de2c65cdb23358194a30eb62a27664352ec9085b6c1d480f2ae8",
+                    "mixHash" : "0x46073830be866d7aedfda01abccaeb8834a72dd3b3613861aad61ff73d6f1ae8",
+                    "nonce" : "0x004ef169e76888f5",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0132148b8dbb4160b78571d4343a97df8b90a5815538fec9d607f278157bf6aaa884520b2705b854d0ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a046073830be866d7aedfda01abccaeb8834a72dd3b3613861aad61ff73d6f1ae888004ef169e76888f5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86e7f44bb31dde9220ddb3654367bf6a98a61471cf72b6ebae53f04c1fa9b020",
+        "lastblockhash" : "0xa16d657f3cc8de2c65cdb23358194a30eb62a27664352ec9085b6c1d480f2ae8",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0xbc1ccae4566f350c9b33ca15568c16d7523e55ed1a119849b2b04fead28f0022",
-                    "mixHash" : "0x8b8a6bd3fca5eefd0a0aaa87f70630abd6b81107e8f6d73776a78c4ac9902ffa",
-                    "nonce" : "0xde3567c07e943537",
+                    "hash" : "0x5f22028f7980ee716e165b51677998dcb4264be19170427612f8466d10285ccc",
+                    "mixHash" : "0x3a76b63d4aed068bbdadda8ad8628b21a010a2c1b8af10b96de9b5d477676261",
+                    "nonce" : "0x6f736e8acf644f23",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a08b8a6bd3fca5eefd0a0aaa87f70630abd6b81107e8f6d73776a78c4ac9902ffa88de3567c07e943537f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a03a76b63d4aed068bbdadda8ad8628b21a010a2c1b8af10b96de9b5d477676261886f736e8acf644f23f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc1ccae4566f350c9b33ca15568c16d7523e55ed1a119849b2b04fead28f0022",
+        "lastblockhash" : "0x5f22028f7980ee716e165b51677998dcb4264be19170427612f8466d10285ccc",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xfd36007489b21a3a9c017f4685de38c4c7ab87f170654bb734e489c487a567f5",
-                    "mixHash" : "0x111a964fae62eece4e311aa18bee49fba4d794846af5c50ef4960acd88bf8461",
-                    "nonce" : "0xc40d4de461ecaa54",
+                    "hash" : "0x397ea043e21850463324052459032071189ec3b015bac93c3e86799550788718",
+                    "mixHash" : "0xa597d178e014f2374356ec1892088566353a9cf618b7478dba14498380a117b0",
+                    "nonce" : "0x9abe17354aad9061",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0111a964fae62eece4e311aa18bee49fba4d794846af5c50ef4960acd88bf846188c40d4de461ecaa54f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a597d178e014f2374356ec1892088566353a9cf618b7478dba14498380a117b0889abe17354aad9061f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd36007489b21a3a9c017f4685de38c4c7ab87f170654bb734e489c487a567f5",
+        "lastblockhash" : "0x397ea043e21850463324052459032071189ec3b015bac93c3e86799550788718",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xaf444841387eb5739801e3c2070c0cebe503360a56c046e081394d95f1855c41",
-                    "mixHash" : "0x11e9603ee0f2bcebb4d3c7fb5e9facf6e3c3b9d60e0a7433533dd3c056259b1b",
-                    "nonce" : "0x1ac4128cefa36a2a",
+                    "hash" : "0x2dfff7f4e5dc315fc12c6ee07aaf4e19841014cedcb179b5591d123594fe024a",
+                    "mixHash" : "0x7b5fe392be66d69fbe0a480caab15b01fbd6579023268e456fd8ab1f6b937d09",
+                    "nonce" : "0x03da6c8e0beb2771",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a011e9603ee0f2bcebb4d3c7fb5e9facf6e3c3b9d60e0a7433533dd3c056259b1b881ac4128cefa36a2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07b5fe392be66d69fbe0a480caab15b01fbd6579023268e456fd8ab1f6b937d098803da6c8e0beb2771f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf444841387eb5739801e3c2070c0cebe503360a56c046e081394d95f1855c41",
+        "lastblockhash" : "0x2dfff7f4e5dc315fc12c6ee07aaf4e19841014cedcb179b5591d123594fe024a",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
index 39ada150b..b99a2138d 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallBasic_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x656215b6f7110db0d5a7ea7f9a84201ef9f30204a960b631acda80ef61616ea4",
-                    "mixHash" : "0x8b51145578de2e0b2daea4b7d7417f9b5c6ec039438107badce8a6e42d945f8e",
-                    "nonce" : "0x6547dd4491a2e93b",
+                    "hash" : "0xcfd62b12d81f9d5711b929a0b622c70b7f300fd44c89cbf7200703c9405052b2",
+                    "mixHash" : "0x06e844633b232c56a5a00ad5b2ddbc51f452fe8dea54e50127db46233f74775e",
+                    "nonce" : "0x74ffd2bc74c8ad6c",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
-                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
+                    "stateRoot" : "0x829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a08b51145578de2e0b2daea4b7d7417f9b5c6ec039438107badce8a6e42d945f8e886547dd4491a2e93bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a006e844633b232c56a5a00ad5b2ddbc51f452fe8dea54e50127db46233f74775e8874ffd2bc74c8ad6cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x656215b6f7110db0d5a7ea7f9a84201ef9f30204a960b631acda80ef61616ea4",
+        "lastblockhash" : "0xcfd62b12d81f9d5711b929a0b622c70b7f300fd44c89cbf7200703c9405052b2",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f137",
+                "balance" : "0x29a2241af62cf137",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "delegatecallBasic_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x79814befe05421b9107c95001eb135d19dc55518d326bc023142a5eb37577530",
-                    "mixHash" : "0x5c156747401fbf49b59e3fbe06fe5b8025e6cd384da6fe7d60de0d633e4de70f",
-                    "nonce" : "0x6be6c73aa7a82917",
+                    "hash" : "0x79b5697a97fdf080872585aa8dfb1a720149308b1b8c757e37ff6aeb6f47546c",
+                    "mixHash" : "0x6aa2427075fc2c464b0412a177870d7fceeab10122807d08095660ca08d4c0a9",
+                    "nonce" : "0xc40a6c00c33e981d",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
-                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
+                    "stateRoot" : "0xf644688363f2011e26bf3f7ab5c5e2c01dea26b21ff916c131ecfbf59aae01ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a05c156747401fbf49b59e3fbe06fe5b8025e6cd384da6fe7d60de0d633e4de70f886be6c73aa7a82917f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f644688363f2011e26bf3f7ab5c5e2c01dea26b21ff916c131ecfbf59aae01eda03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a06aa2427075fc2c464b0412a177870d7fceeab10122807d08095660ca08d4c0a988c40a6c00c33e981df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79814befe05421b9107c95001eb135d19dc55518d326bc023142a5eb37577530",
+        "lastblockhash" : "0x79b5697a97fdf080872585aa8dfb1a720149308b1b8c757e37ff6aeb6f47546c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f137",
+                "balance" : "0x29a2241af62cf137",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "delegatecallBasic_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0xfc42fdb77007a8b816a0c0c2d9217e5c2abb1f8ecbe6747cc392cb0390edf578",
-                    "mixHash" : "0x013b6cffb448792782f9f5319c41a1cfe1e432adc38c22e1197b9ae1e27c7e91",
-                    "nonce" : "0xaa1ce74910dd0aaa",
+                    "hash" : "0x4cd155bbb619e4b33ad84e33e707158bb01e9fff94b3ec05cc9960d9bc2b6e33",
+                    "mixHash" : "0xe40168771e775012410730db17637ec6554d89b29ab3e3f01b637e86b69fd787",
+                    "nonce" : "0x819aba10a582c131",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0013b6cffb448792782f9f5319c41a1cfe1e432adc38c22e1197b9ae1e27c7e9188aa1ce74910dd0aaaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0e40168771e775012410730db17637ec6554d89b29ab3e3f01b637e86b69fd78788819aba10a582c131f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc42fdb77007a8b816a0c0c2d9217e5c2abb1f8ecbe6747cc392cb0390edf578",
+        "lastblockhash" : "0x4cd155bbb619e4b33ad84e33e707158bb01e9fff94b3ec05cc9960d9bc2b6e33",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "delegatecallBasic_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x79d9c821846693649618f0cada726e8b0f338540ceacf06af8edab4d53892a2d",
-                    "mixHash" : "0xfd63882b2439477c3e5028f2d02f8c3c0e9776f6eae9e706175a7eb9c0b44ed9",
-                    "nonce" : "0x8aebedf209ef7658",
+                    "hash" : "0x75084f7b134d767eeedae627eaf82abc580ccb7d6ec9efb2011f77cea3fe0fca",
+                    "mixHash" : "0xfe2654a69aa95b59fa3c75cdd571f40c33b7daba4f42e91fffc70d457f5b294b",
+                    "nonce" : "0x994c91ebb44dca49",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0fd63882b2439477c3e5028f2d02f8c3c0e9776f6eae9e706175a7eb9c0b44ed9888aebedf209ef7658f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0fe2654a69aa95b59fa3c75cdd571f40c33b7daba4f42e91fffc70d457f5b294b88994c91ebb44dca49f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79d9c821846693649618f0cada726e8b0f338540ceacf06af8edab4d53892a2d",
+        "lastblockhash" : "0x75084f7b134d767eeedae627eaf82abc580ccb7d6ec9efb2011f77cea3fe0fca",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "delegatecallBasic_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x6c6e10dd9a2f4295ce4358644a6af1dcf5284a264e5c6e64a4efa94a157863c3",
-                    "mixHash" : "0xc8c878916c130aa8131b1dcd3d27cad0daf59d13932faad6f0ec3758be369f5b",
-                    "nonce" : "0x9bf09215f2ac02e1",
+                    "hash" : "0x72a4a25e60c72a170a6d534776f941052e679de9d9808afd6135b9f76d6a1f43",
+                    "mixHash" : "0xad5975d8d29488e7e1f2dd56ff6e601f25c95bc23f8c28b27f0ffe67a409a07a",
+                    "nonce" : "0x876d5abf179c4bdc",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c8c878916c130aa8131b1dcd3d27cad0daf59d13932faad6f0ec3758be369f5b889bf09215f2ac02e1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ad5975d8d29488e7e1f2dd56ff6e601f25c95bc23f8c28b27f0ffe67a409a07a88876d5abf179c4bdcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c6e10dd9a2f4295ce4358644a6af1dcf5284a264e5c6e64a4efa94a157863c3",
+        "lastblockhash" : "0x72a4a25e60c72a170a6d534776f941052e679de9d9808afd6135b9f76d6a1f43",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "delegatecallBasic_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xeea3",
-                    "hash" : "0x8d5cc3e982813286aec80b243dc4c1774bf7b4ce6925aff5f126430b09f1f54c",
-                    "mixHash" : "0x2d0ed7a6b0c926c93a8323fff3a43c1aaaba5d29836eae5af480ff3af3c528b8",
-                    "nonce" : "0x06ab760ef8e608f7",
+                    "hash" : "0x0f1f65010c4b4950a57c8c08150788f53e51f39ec86c7ee2be6353df11446e61",
+                    "mixHash" : "0x04c58a1fd4faeaa3a2b75d870ca997179b14aa69b32ba14579e58ab7fde4c3d6",
+                    "nonce" : "0x3fda34e054874b2f",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a02d0ed7a6b0c926c93a8323fff3a43c1aaaba5d29836eae5af480ff3af3c528b88806ab760ef8e608f7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a004c58a1fd4faeaa3a2b75d870ca997179b14aa69b32ba14579e58ab7fde4c3d6883fda34e054874b2ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d5cc3e982813286aec80b243dc4c1774bf7b4ce6925aff5f126430b09f1f54c",
+        "lastblockhash" : "0x0f1f65010c4b4950a57c8c08150788f53e51f39ec86c7ee2be6353df11446e61",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
index 2cd6781ac..6dfdd881e 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallEmptycontract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0x191126d57204e4e6d09db7e8fac6063e7b6ae13235408111bed6c3cae32102d1",
-                    "mixHash" : "0x56b5adfeae13cb3619bf6faa9711f3f061e8ee7924ecefa5be4bb0e974bed6fb",
-                    "nonce" : "0x66564b5573693ccf",
+                    "hash" : "0xb95ac07805f6849ea8ae3b444452a1ef8def9ccec192db7ef90d1a2a6641b716",
+                    "mixHash" : "0x1cd30dc3b4ab2a12f3967497192ab4d1d87f1ab1942013cf5d77fda619ce444b",
+                    "nonce" : "0x9db2898575a2311d",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
-                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
+                    "stateRoot" : "0xb0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a056b5adfeae13cb3619bf6faa9711f3f061e8ee7924ecefa5be4bb0e974bed6fb8866564b5573693ccff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a01cd30dc3b4ab2a12f3967497192ab4d1d87f1ab1942013cf5d77fda619ce444b889db2898575a2311df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x191126d57204e4e6d09db7e8fac6063e7b6ae13235408111bed6c3cae32102d1",
+        "lastblockhash" : "0xb95ac07805f6849ea8ae3b444452a1ef8def9ccec192db7ef90d1a2a6641b716",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a2ff",
+                "balance" : "0x29a2241af62ca2ff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -115,7 +108,7 @@
     "delegatecallEmptycontract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +120,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0x49f2b0f9747fd79047d4f818f5bbe0bfd6b8a9b4ee55ec9ad957f1ec8a6edbec",
-                    "mixHash" : "0xfb32918a76def6502055a32eb6be496797f6983e4b540962b6589131b38db267",
-                    "nonce" : "0x99ff65b69b5ce894",
+                    "hash" : "0x4630ee454e54e5404fe3a3cd78cd0fbf9f6a41892981b6531259f8fa03457203",
+                    "mixHash" : "0x885f083e2b6e25c11e309cb4d324ec6b9ea716a35f8e365ab0a1189e1951acce",
+                    "nonce" : "0x0dad4dce6d56fdc5",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
-                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
+                    "stateRoot" : "0xfd5b0ffa66d0a11ec5134f955afabb1b93005ec979f44b793501351e2efefea7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0fb32918a76def6502055a32eb6be496797f6983e4b540962b6589131b38db2678899ff65b69b5ce894f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd5b0ffa66d0a11ec5134f955afabb1b93005ec979f44b793501351e2efefea7a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0885f083e2b6e25c11e309cb4d324ec6b9ea716a35f8e365ab0a1189e1951acce880dad4dce6d56fdc5f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,7 +168,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x49f2b0f9747fd79047d4f818f5bbe0bfd6b8a9b4ee55ec9ad957f1ec8a6edbec",
+        "lastblockhash" : "0x4630ee454e54e5404fe3a3cd78cd0fbf9f6a41892981b6531259f8fa03457203",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -194,7 +187,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a2ff",
+                "balance" : "0x29a2241af62ca2ff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -228,7 +221,7 @@
     "delegatecallEmptycontract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0xc624ef17576feba9b8512d4757e0a22212807ef3b5936bcf871c1bd7f98f8124",
-                    "mixHash" : "0xf76918520bec463163a825b0d9ce52d2647008247a4a2dcea32e6776fef90ac4",
-                    "nonce" : "0xce67fe750ec06b06",
+                    "hash" : "0x6740876e9f5ac55e316ea0f6fb5c06e345fc11ca38057be7da7d1a574a222af7",
+                    "mixHash" : "0x65705d91964b4bf46bed86518e061211b61d303b9078a9b992e52458f5719e89",
+                    "nonce" : "0x5539265dc33dc4f3",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
@@ -251,7 +244,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0f76918520bec463163a825b0d9ce52d2647008247a4a2dcea32e6776fef90ac488ce67fe750ec06b06f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a065705d91964b4bf46bed86518e061211b61d303b9078a9b992e52458f5719e89885539265dc33dc4f3f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc624ef17576feba9b8512d4757e0a22212807ef3b5936bcf871c1bd7f98f8124",
+        "lastblockhash" : "0x6740876e9f5ac55e316ea0f6fb5c06e345fc11ca38057be7da7d1a574a222af7",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -334,7 +327,7 @@
     "delegatecallEmptycontract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +339,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0xaec302a3d366798395bed92ed8b6ca4374e754813658ad71dc4124f82e0bc1d5",
-                    "mixHash" : "0x29b2a922073ac4816b9b50d406b4344b92456b0dd045c2479674519e25eba9a3",
-                    "nonce" : "0xa30ae99349476534",
+                    "hash" : "0xd22e104a6e8f00b96c3a427fa76c975d7a0a25d7744fdab49a84dfb0f6b1fd6c",
+                    "mixHash" : "0x31d124a3a89112b4fc8a6cc18ebceb46facfc22d45cc8630428612e359acd4b0",
+                    "nonce" : "0x75ec9dcb67db5b9f",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
@@ -357,7 +350,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a029b2a922073ac4816b9b50d406b4344b92456b0dd045c2479674519e25eba9a388a30ae99349476534f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a031d124a3a89112b4fc8a6cc18ebceb46facfc22d45cc8630428612e359acd4b08875ec9dcb67db5b9ff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,7 +387,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaec302a3d366798395bed92ed8b6ca4374e754813658ad71dc4124f82e0bc1d5",
+        "lastblockhash" : "0xd22e104a6e8f00b96c3a427fa76c975d7a0a25d7744fdab49a84dfb0f6b1fd6c",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -440,7 +433,7 @@
     "delegatecallEmptycontract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -452,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019a54",
-                    "hash" : "0xfebfcac101ecbf19c8aaaa4ce778931fb2a79dfe68c89d7fef8695a856037009",
-                    "mixHash" : "0xd7b4b2ceed0f1974de82ef06bf058a33e514fc079c75ab56ce1e7e57d9cdac29",
-                    "nonce" : "0x23cac0a5d8ee08a9",
+                    "hash" : "0x85a90dbb55c7d8f8b35be231ebeca58c85ba66dd7878917e172674153d691d22",
+                    "mixHash" : "0x82d4b68c3f78799f844b76b006667aeb372fa6f16f5d71261c44ade34479c9f9",
+                    "nonce" : "0x330b36cc7cc9a619",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
@@ -463,7 +456,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0d7b4b2ceed0f1974de82ef06bf058a33e514fc079c75ab56ce1e7e57d9cdac298823cac0a5d8ee08a9f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a082d4b68c3f78799f844b76b006667aeb372fa6f16f5d71261c44ade34479c9f988330b36cc7cc9a619f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -500,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfebfcac101ecbf19c8aaaa4ce778931fb2a79dfe68c89d7fef8695a856037009",
+        "lastblockhash" : "0x85a90dbb55c7d8f8b35be231ebeca58c85ba66dd7878917e172674153d691d22",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -545,7 +538,7 @@
     "delegatecallEmptycontract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -557,9 +550,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa06b",
-                    "hash" : "0x63ce5f7af5a7073604da3b7d7e288cf1f5764682eb9c006972ae1ab048ce9651",
-                    "mixHash" : "0xe29bf4d4ee7b698f94a584895b834e593cb56f1d92c0fea929d9d5e627ba6872",
-                    "nonce" : "0x57ff6da99a967d4d",
+                    "hash" : "0x5ac96a3c7ebe28279b6111f20266e7a142f325f8d7ee7c948a18b0c2eb38a7a2",
+                    "mixHash" : "0x89ec06e92f8aec29ad6618e28edc60b0dd03bb70e016d4fe58d80342434610ba",
+                    "nonce" : "0xa032fd9c921ef212",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
@@ -568,7 +561,7 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a0e29bf4d4ee7b698f94a584895b834e593cb56f1d92c0fea929d9d5e627ba68728857ff6da99a967d4df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a089ec06e92f8aec29ad6618e28edc60b0dd03bb70e016d4fe58d80342434610ba88a032fd9c921ef212f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -605,7 +598,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63ce5f7af5a7073604da3b7d7e288cf1f5764682eb9c006972ae1ab048ce9651",
+        "lastblockhash" : "0x5ac96a3c7ebe28279b6111f20266e7a142f325f8d7ee7c948a18b0c2eb38a7a2",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
index 29579d845..1ec755d8f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0x446718314233bc206cb96c3aeaf980d15b018225d40ee48dc3ebd1c4471a8c47",
-                    "mixHash" : "0xeb6a38b3413788322063b402cf2ebf5a1f0c9b2e72485fe50842602e78381a7f",
-                    "nonce" : "0x40cae8227677480c",
+                    "hash" : "0x9930f6f5036b6d4c25f190a30b6fc38493a2898c90a4ff4366fa096287578e44",
+                    "mixHash" : "0x6b5f0a81ba5000f0976b34ca1bf84c117479cac6ecddf7c4ce91db499c8eca81",
+                    "nonce" : "0x520aeb1a7731e001",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
-                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
+                    "stateRoot" : "0xac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0eb6a38b3413788322063b402cf2ebf5a1f0c9b2e72485fe50842602e78381a7f8840cae8227677480cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a06b5f0a81ba5000f0976b34ca1bf84c117479cac6ecddf7c4ce91db499c8eca8188520aeb1a7731e001f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x446718314233bc206cb96c3aeaf980d15b018225d40ee48dc3ebd1c4471a8c47",
+        "lastblockhash" : "0x9930f6f5036b6d4c25f190a30b6fc38493a2898c90a4ff4366fa096287578e44",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -88,7 +81,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52020",
+                "balance" : "0x29a2241af62d2020",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -122,7 +115,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0xefc01a3d63e89d5eaf57064d937c72f563b81ff4d42a739c0aef2d8ccff296c5",
-                    "mixHash" : "0x3d911ad25bbec60d4bc27826dff58b73750a9ddc8f26cb3c43966d6c39014c56",
-                    "nonce" : "0xde26fb30b718137a",
+                    "hash" : "0xcf963096c13aa3c6a5cbf1422d9e7e974aa7f5ce7937e74a55aa0ee16c570f50",
+                    "mixHash" : "0xb1830fcb55652f5e979b95082a9478332bffc19a8d6ff921c073b2c807d731fa",
+                    "nonce" : "0x0e1d17344283b2e3",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
-                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
+                    "stateRoot" : "0x3022a0936407654f10557bee8276d0fed3f032aa0d9c4674551dd4a0fb52b5e4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a03d911ad25bbec60d4bc27826dff58b73750a9ddc8f26cb3c43966d6c39014c5688de26fb30b718137af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03022a0936407654f10557bee8276d0fed3f032aa0d9c4674551dd4a0fb52b5e4a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0b1830fcb55652f5e979b95082a9478332bffc19a8d6ff921c073b2c807d731fa880e1d17344283b2e3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,7 +175,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefc01a3d63e89d5eaf57064d937c72f563b81ff4d42a739c0aef2d8ccff296c5",
+        "lastblockhash" : "0xcf963096c13aa3c6a5cbf1422d9e7e974aa7f5ce7937e74a55aa0ee16c570f50",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52020",
+                "balance" : "0x29a2241af62d2020",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -242,7 +235,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -254,9 +247,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0xb5de0679ca8f62b6230b320f094798c72c9bfb19c6b060d06793843704662dd6",
-                    "mixHash" : "0xb051657aa74ad4b864cbe20f4540100f8939e3084c0fcae76920440824d51eba",
-                    "nonce" : "0x63ae5edd3debf1c4",
+                    "hash" : "0x2101eaeaf2c226de37199ce7350d9d7439fe3ba711053208d71a8c719b48aaa5",
+                    "mixHash" : "0xd5a3a539a2ef50b3554bd6c055f68bde698c6420d6ebef9a6ba8a549f8af5f0c",
+                    "nonce" : "0xce329104d54fb766",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
@@ -265,7 +258,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0b051657aa74ad4b864cbe20f4540100f8939e3084c0fcae76920440824d51eba8863ae5edd3debf1c4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0d5a3a539a2ef50b3554bd6c055f68bde698c6420d6ebef9a6ba8a549f8af5f0c88ce329104d54fb766f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,7 +295,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb5de0679ca8f62b6230b320f094798c72c9bfb19c6b060d06793843704662dd6",
+        "lastblockhash" : "0x2101eaeaf2c226de37199ce7350d9d7439fe3ba711053208d71a8c719b48aaa5",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -355,7 +348,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -367,9 +360,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0xd5cfc321b7bbe571fb89efb70909aee5d21b484c0cc0e63987c7b12d933e4c9b",
-                    "mixHash" : "0xefcbc1c30b96e5b1ee9bce3a107675c6f40aa2a9f83cdb9928ed8a1c7a7bd796",
-                    "nonce" : "0xe265af1da77cea1c",
+                    "hash" : "0xa0590e5ba8b9271333d202f128df43f1760c038dede31070381db670841a2922",
+                    "mixHash" : "0x28436d628d1188e074c89151a617528f9d2c8bd3d4129dc8e0c3293f5d8f3d0d",
+                    "nonce" : "0x83ea7e0364833f9a",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
@@ -378,7 +371,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0efcbc1c30b96e5b1ee9bce3a107675c6f40aa2a9f83cdb9928ed8a1c7a7bd79688e265af1da77cea1cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a028436d628d1188e074c89151a617528f9d2c8bd3d4129dc8e0c3293f5d8f3d0d8883ea7e0364833f9af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -415,7 +408,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5cfc321b7bbe571fb89efb70909aee5d21b484c0cc0e63987c7b12d933e4c9b",
+        "lastblockhash" : "0xa0590e5ba8b9271333d202f128df43f1760c038dede31070381db670841a2922",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -468,7 +461,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -480,9 +473,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x9f6a897cda664d624fea1a26d0c8517e6024eb85aad92177e2ed79e4d5a7884d",
-                    "mixHash" : "0x43daf3c1b84b428f78c0108c131f73f8238d689184f3665409e274eb0f492a23",
-                    "nonce" : "0x2c790a2e1ae33596",
+                    "hash" : "0x4d25167d38507467fd6153ace89c0a285f4e810cf342e7ad14511fabf7702062",
+                    "mixHash" : "0x2969e7c5f893071ac8bba599d586c5feef8cc071e69d494fb040b38774a58d0d",
+                    "nonce" : "0x488c7744e0a8ab72",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
@@ -491,7 +484,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a043daf3c1b84b428f78c0108c131f73f8238d689184f3665409e274eb0f492a23882c790a2e1ae33596f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02969e7c5f893071ac8bba599d586c5feef8cc071e69d494fb040b38774a58d0d88488c7744e0a8ab72f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -528,7 +521,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f6a897cda664d624fea1a26d0c8517e6024eb85aad92177e2ed79e4d5a7884d",
+        "lastblockhash" : "0x4d25167d38507467fd6153ace89c0a285f4e810cf342e7ad14511fabf7702062",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,7 +566,7 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -585,9 +578,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8c",
-                    "hash" : "0x349c60c22b4e62bbf9435dbe5d878434bcc0c7ca8a34634ef0994f885436d42b",
-                    "mixHash" : "0x55b70ff3ad21243922f53a0d7020e5c0a2bcd7f8ac9840082cb03414c7c0ee5a",
-                    "nonce" : "0xf31921175a75e801",
+                    "hash" : "0x77c0fe2d65d7f067b68aa7c430e5409a23d21eaafebafe377e9f3431f3adf081",
+                    "mixHash" : "0x42ec0ebed86edad12df6770f1a070c0319f7aa174b0415f9902776c099dc8d8e",
+                    "nonce" : "0xc68e2fc2813764ac",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
@@ -596,7 +589,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a055b70ff3ad21243922f53a0d7020e5c0a2bcd7f8ac9840082cb03414c7c0ee5a88f31921175a75e801f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a042ec0ebed86edad12df6770f1a070c0319f7aa174b0415f9902776c099dc8d8e88c68e2fc2813764acf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -633,7 +626,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x349c60c22b4e62bbf9435dbe5d878434bcc0c7ca8a34634ef0994f885436d42b",
+        "lastblockhash" : "0x77c0fe2d65d7f067b68aa7c430e5409a23d21eaafebafe377e9f3431f3adf081",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
index f429c56e5..d2b05a6c5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x26500fe4e6b492f97fc339bcf34c736532fd6ab0d7d6cb9769e4ede772920f5c",
-                    "mixHash" : "0xb4b6a6c67d40206e80448e708aac537cfb6ac11194ac5afd7eaf53f9eb5035a3",
-                    "nonce" : "0xfdb418e7099e738d",
+                    "hash" : "0x2eb914c5d588baf1345e782df31a01c97ed7d19d58faacd6a22d95ac4fb7837a",
+                    "mixHash" : "0x3e00035c33d65945a91e96c46673455711f513f7aaad3068b94429b823b58482",
+                    "nonce" : "0x0ffac17fefcd987c",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
-                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
+                    "stateRoot" : "0xb91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b4b6a6c67d40206e80448e708aac537cfb6ac11194ac5afd7eaf53f9eb5035a388fdb418e7099e738df862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a03e00035c33d65945a91e96c46673455711f513f7aaad3068b94429b823b58482880ffac17fefcd987cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26500fe4e6b492f97fc339bcf34c736532fd6ab0d7d6cb9769e4ede772920f5c",
+        "lastblockhash" : "0x2eb914c5d588baf1345e782df31a01c97ed7d19d58faacd6a22d95ac4fb7837a",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
@@ -90,7 +83,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5bc6b",
+                "balance" : "0x29a2241af62dbc6b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -138,7 +131,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -150,18 +143,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0xfad96dd4a43922c3698547d7b883d7a810069c050a5c76329c351ba1225b0302",
-                    "mixHash" : "0xb86d3a8a0e67f0f4e56e42db78d4117abf38e341eb86b7297f137a33db8ee85e",
-                    "nonce" : "0x8dbec29102caf991",
+                    "hash" : "0x8b2fa37fd831bc276d24f56e3a87345cef429e2c0ab94c95828cd3839391b828",
+                    "mixHash" : "0xe8a2358e224e5f37e3f9d21c7d1e537473c3856111ca94ca8c561b9af848be6c",
+                    "nonce" : "0x786615d70af31ed0",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
-                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
+                    "stateRoot" : "0x78afdee3b49eecbcfec715b22f3c6e5c52094940f80a4701f05a5b46019982ab",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b86d3a8a0e67f0f4e56e42db78d4117abf38e341eb86b7297f137a33db8ee85e888dbec29102caf991f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078afdee3b49eecbcfec715b22f3c6e5c52094940f80a4701f05a5b46019982aba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0e8a2358e224e5f37e3f9d21c7d1e537473c3856111ca94ca8c561b9af848be6c88786615d70af31ed0f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -198,7 +191,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfad96dd4a43922c3698547d7b883d7a810069c050a5c76329c351ba1225b0302",
+        "lastblockhash" : "0x8b2fa37fd831bc276d24f56e3a87345cef429e2c0ab94c95828cd3839391b828",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -226,7 +219,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5bc6b",
+                "balance" : "0x29a2241af62dbc6b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -274,7 +267,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -286,9 +279,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x9c79017d6ee9e82476c33b818299987a9ecd073bb1f69316ecab3cf467d37236",
-                    "mixHash" : "0x33ade67d5118edddcf029b5de4fb9625269ecd27e2649d5791a8c8d76ee8819d",
-                    "nonce" : "0x44fe9c77b6c8b9fa",
+                    "hash" : "0x6627bcbabd9c8e5404e50138c8e00487a89c05b36bcb9202fde4003dcbb7d241",
+                    "mixHash" : "0x1b691ef16930c2845a0e0dc4b27cb48c5fd917034f79bc344560788e2b3455bc",
+                    "nonce" : "0xf3ce341efa1dc923",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
@@ -297,7 +290,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a033ade67d5118edddcf029b5de4fb9625269ecd27e2649d5791a8c8d76ee8819d8844fe9c77b6c8b9faf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a01b691ef16930c2845a0e0dc4b27cb48c5fd917034f79bc344560788e2b3455bc88f3ce341efa1dc923f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -334,7 +327,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c79017d6ee9e82476c33b818299987a9ecd073bb1f69316ecab3cf467d37236",
+        "lastblockhash" : "0x6627bcbabd9c8e5404e50138c8e00487a89c05b36bcb9202fde4003dcbb7d241",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -403,7 +396,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -415,9 +408,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0xcf184d9cd36c7d3c5a1efd99d9113550ebe8dd5a8b5cdaa714e7a6d8ac52e2aa",
-                    "mixHash" : "0x5e66a5affc24d073b3d7c0a1baa9ef1fcdaffb709aff603f6a23a773a7ff6864",
-                    "nonce" : "0xd42e2bbfa7d04a4c",
+                    "hash" : "0x1480e2dd2d26338724f4f83f5ca8c5e415138c58a14ea951c31b6c39ffea9dc8",
+                    "mixHash" : "0xd0282f35ab8f59df6d84e4ec8f745ef21b3ad913e5fce6bdacafe37ff101cc1e",
+                    "nonce" : "0xd96d75b24c1f663c",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
@@ -426,7 +419,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a05e66a5affc24d073b3d7c0a1baa9ef1fcdaffb709aff603f6a23a773a7ff686488d42e2bbfa7d04a4cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0d0282f35ab8f59df6d84e4ec8f745ef21b3ad913e5fce6bdacafe37ff101cc1e88d96d75b24c1f663cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -463,7 +456,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf184d9cd36c7d3c5a1efd99d9113550ebe8dd5a8b5cdaa714e7a6d8ac52e2aa",
+        "lastblockhash" : "0x1480e2dd2d26338724f4f83f5ca8c5e415138c58a14ea951c31b6c39ffea9dc8",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -532,7 +525,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -544,9 +537,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "0x7bea798cc0e663120f91fe848184b0595e75a2ab80e30d9441e43a6db1251cf8",
-                    "mixHash" : "0x44ebeb8e6543ab277f8817896cf68a81237a70ab8572b8dd3856c16f87c50cc8",
-                    "nonce" : "0xa77325d348b297b1",
+                    "hash" : "0xd749f5c711c8607beeb66f8adfe204efc47761b0d740151a9d93055990c3eed7",
+                    "mixHash" : "0xb4a9587ea15bd261e8e7d80c99011f86fcd2aefdc39f68f24b390e1b20128f6b",
+                    "nonce" : "0x918e8802deb65375",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
@@ -555,7 +548,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a044ebeb8e6543ab277f8817896cf68a81237a70ab8572b8dd3856c16f87c50cc888a77325d348b297b1f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0b4a9587ea15bd261e8e7d80c99011f86fcd2aefdc39f68f24b390e1b20128f6b88918e8802deb65375f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -592,7 +585,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bea798cc0e663120f91fe848184b0595e75a2ab80e30d9441e43a6db1251cf8",
+        "lastblockhash" : "0xd749f5c711c8607beeb66f8adfe204efc47761b0d740151a9d93055990c3eed7",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -651,7 +644,7 @@
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -663,9 +656,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "0xa8207115e9415893e8aef46c03a55320c4445d063fa6de8e4c85c7400fd0c752",
-                    "mixHash" : "0x3f3f498c87db2899c2989323fb7372d8c8370ec42aa8390b59640845f90782d2",
-                    "nonce" : "0xe6541144c97efa80",
+                    "hash" : "0x977eff931f830f1b397f6c2e23f9976257ee5999ba7f76e87b467e51a29bae92",
+                    "mixHash" : "0x311a1f71fbf69e5e9416769fe958b64202ca440a0dce6a959e9528b2229d51f5",
+                    "nonce" : "0x488a3064f9efaf6a",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
@@ -674,7 +667,7 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a03f3f498c87db2899c2989323fb7372d8c8370ec42aa8390b59640845f90782d288e6541144c97efa80f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0311a1f71fbf69e5e9416769fe958b64202ca440a0dce6a959e9528b2229d51f588488a3064f9efaf6af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -711,7 +704,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8207115e9415893e8aef46c03a55320c4445d063fa6de8e4c85c7400fd0c752",
+        "lastblockhash" : "0x977eff931f830f1b397f6c2e23f9976257ee5999ba7f76e87b467e51a29bae92",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
index 07da571c7..648df7f74 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x58d26dd64cb83b473dba4d8ee68427762f3a667810206066723305e21a8f7897",
-                    "mixHash" : "0x01e8a478cfd91fffa9a1c7e3d90981155007108a710eb5fb724154dbdf3dddc6",
-                    "nonce" : "0xb08c78e515b608e5",
+                    "hash" : "0xdc1b4ad65953f14c3e4a2e0fa355c9f876d8acaf08223454a8995923d9889dab",
+                    "mixHash" : "0xeef0ac95115faf0e265853a8f8437544076d812cc672782156963ee6e0092925",
+                    "nonce" : "0x0a3dff322d81cadf",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
-                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
+                    "stateRoot" : "0x5696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a001e8a478cfd91fffa9a1c7e3d90981155007108a710eb5fb724154dbdf3dddc688b08c78e515b608e5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0eef0ac95115faf0e265853a8f8437544076d812cc672782156963ee6e0092925880a3dff322d81cadff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58d26dd64cb83b473dba4d8ee68427762f3a667810206066723305e21a8f7897",
+        "lastblockhash" : "0xdc1b4ad65953f14c3e4a2e0fa355c9f876d8acaf08223454a8995923d9889dab",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -98,7 +91,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f60a90",
+                "balance" : "0x29a2241af62e0a90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -153,7 +146,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -165,18 +158,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0xd8d4448a3aff1f0464ecf67ab538496915be4dadc4a52b9c8c5ddcd6013342a4",
-                    "mixHash" : "0x8790f68e938cd478835d21ff5efb8bb7245fdc4d1274e464155d630e97025248",
-                    "nonce" : "0x7b157830206f3a15",
+                    "hash" : "0x8532070c0917c7a7639aee7b9404fb270d068966ade1cb032406316e2e95ad34",
+                    "mixHash" : "0x398bc773c9be947cef23308715d6102875a1492272f7454be2b3c5b09a39e36b",
+                    "nonce" : "0x047d671fe669be10",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
-                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
+                    "stateRoot" : "0xded7e4699dcae6c9567d4137ba2c6e3259f236cbdcd3af88546be6cee218e408",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a08790f68e938cd478835d21ff5efb8bb7245fdc4d1274e464155d630e97025248887b157830206f3a15f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ded7e4699dcae6c9567d4137ba2c6e3259f236cbdcd3af88546be6cee218e408a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0398bc773c9be947cef23308715d6102875a1492272f7454be2b3c5b09a39e36b88047d671fe669be10f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -213,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd8d4448a3aff1f0464ecf67ab538496915be4dadc4a52b9c8c5ddcd6013342a4",
+        "lastblockhash" : "0x8532070c0917c7a7639aee7b9404fb270d068966ade1cb032406316e2e95ad34",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -249,7 +242,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f60a90",
+                "balance" : "0x29a2241af62e0a90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -304,7 +297,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -316,9 +309,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x7395fb1b9e81192a1653be92d03aa74acc142d4d76ebc579ae267de7a3e78c9c",
-                    "mixHash" : "0x3c4d1739ddffe3a834bae8b91d8653e7bef827aa9e0c27c38452c8e7006528d5",
-                    "nonce" : "0xe29abe06a4254bb0",
+                    "hash" : "0xa984aa46bdf0566238ef33ab4b41c2c7a197c99b66580c8c07ae4477b9afe04b",
+                    "mixHash" : "0x8bc43c1f6a30fd1100afcfe8fa5254359b6991e846e6bce161963b8f9855e206",
+                    "nonce" : "0x433a5e576e75efdc",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
@@ -327,7 +320,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a03c4d1739ddffe3a834bae8b91d8653e7bef827aa9e0c27c38452c8e7006528d588e29abe06a4254bb0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a08bc43c1f6a30fd1100afcfe8fa5254359b6991e846e6bce161963b8f9855e20688433a5e576e75efdcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -364,7 +357,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7395fb1b9e81192a1653be92d03aa74acc142d4d76ebc579ae267de7a3e78c9c",
+        "lastblockhash" : "0xa984aa46bdf0566238ef33ab4b41c2c7a197c99b66580c8c07ae4477b9afe04b",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -448,7 +441,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,9 +453,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0xc24f7e8d6ec74df4e2276a051898fdb5be644c9a4c6aa2a3e56926c32a87b471",
-                    "mixHash" : "0xb2603c3a46dc167182cb399bfc27c50eb84511969962f81441f18757fe87973f",
-                    "nonce" : "0xff8d9f909b8b1c10",
+                    "hash" : "0x344d4d8d0cf624d65c9550aec182cf3a5a2649b11a28ec95b1faff220a1b6cde",
+                    "mixHash" : "0x2f7af7da6af9612546fbcc58b4e8b0bf68e1d82602fa30f0349b8149f9aab98d",
+                    "nonce" : "0xa5efea1bcf39cfa2",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
@@ -471,7 +464,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0b2603c3a46dc167182cb399bfc27c50eb84511969962f81441f18757fe87973f88ff8d9f909b8b1c10f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a02f7af7da6af9612546fbcc58b4e8b0bf68e1d82602fa30f0349b8149f9aab98d88a5efea1bcf39cfa2f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -508,7 +501,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc24f7e8d6ec74df4e2276a051898fdb5be644c9a4c6aa2a3e56926c32a87b471",
+        "lastblockhash" : "0x344d4d8d0cf624d65c9550aec182cf3a5a2649b11a28ec95b1faff220a1b6cde",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -592,7 +585,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -604,9 +597,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x4adb13886dd178b3e1a59ea82812376f2be3fdf5ff71e82ae9a8eb8737296d47",
-                    "mixHash" : "0xf45900f971fb96780205c0d224d066e06051976faf48c35f7828c2c4f83ac145",
-                    "nonce" : "0xddf2e204d68b9a0d",
+                    "hash" : "0xa9da606c8a5e0b035283ee3692fea084d58b33f5dcb68ce9a5bb5b2c840bfd30",
+                    "mixHash" : "0x6efdf44e4c4240ad4dabcdc63775339bf11c87df87b1646aee69d4160be1bbde",
+                    "nonce" : "0xe13bb5f100da131b",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
@@ -615,7 +608,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0f45900f971fb96780205c0d224d066e06051976faf48c35f7828c2c4f83ac14588ddf2e204d68b9a0df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a06efdf44e4c4240ad4dabcdc63775339bf11c87df87b1646aee69d4160be1bbde88e13bb5f100da131bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -652,7 +645,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4adb13886dd178b3e1a59ea82812376f2be3fdf5ff71e82ae9a8eb8737296d47",
+        "lastblockhash" : "0xa9da606c8a5e0b035283ee3692fea084d58b33f5dcb68ce9a5bb5b2c840bfd30",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -725,7 +718,7 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -737,9 +730,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0207fc",
-                    "hash" : "0xfdee4ae9502a71ff73dd7c56801605a09ed87817bd4bc8c067a889b984965f79",
-                    "mixHash" : "0x891269ab23a9388ff8b6885a5fa7f103740467ae5b192e36df50136ed052101c",
-                    "nonce" : "0xd6f08cf1110c8e15",
+                    "hash" : "0x0deca4d57820c0015de90fcd27a32679978a7d7fa199a1176b48b69736e2f3f3",
+                    "mixHash" : "0x6bc9b9a71710b5243b467ba5a4b1417b109315a1924c90e73a0edf9ac62852f8",
+                    "nonce" : "0x9ed3ff1f7db3599b",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
@@ -748,7 +741,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0891269ab23a9388ff8b6885a5fa7f103740467ae5b192e36df50136ed052101c88d6f08cf1110c8e15f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a06bc9b9a71710b5243b467ba5a4b1417b109315a1924c90e73a0edf9ac62852f8889ed3ff1f7db3599bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -785,7 +778,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdee4ae9502a71ff73dd7c56801605a09ed87817bd4bc8c067a889b984965f79",
+        "lastblockhash" : "0x0deca4d57820c0015de90fcd27a32679978a7d7fa199a1176b48b69736e2f3f3",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
index 01fda40fb..6dd029581 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallOOGinCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x83b6df4cc2820a39acfd8df81e2dd35ba0c3fa0774261ef2fc808a74a1ff6754",
-                    "mixHash" : "0xe8d4cb6f9e75e22897343998ae4d9a8ee4e332ed3faa64022962dc39a034981a",
-                    "nonce" : "0xc5627cd8aab12102",
+                    "hash" : "0x7f2a863061fb770937fb92b7d84053e8951a6a83d6f5b68834758a91c3595a1e",
+                    "mixHash" : "0x65ba93fa66ac92168e7456abd7cbbfb67c2cf29d8ebd5349632d46cbb927eaf7",
+                    "nonce" : "0x1881d7a4742caa79",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
-                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
+                    "stateRoot" : "0x1de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0e8d4cb6f9e75e22897343998ae4d9a8ee4e332ed3faa64022962dc39a034981a88c5627cd8aab12102f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2da03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a065ba93fa66ac92168e7456abd7cbbfb67c2cf29d8ebd5349632d46cbb927eaf7881881d7a4742caa79f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83b6df4cc2820a39acfd8df81e2dd35ba0c3fa0774261ef2fc808a74a1ff6754",
+        "lastblockhash" : "0x7f2a863061fb770937fb92b7d84053e8951a6a83d6f5b68834758a91c3595a1e",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0f",
+                "balance" : "0x29a2241af62cca0f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -129,7 +122,7 @@
     "delegatecallOOGinCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x424732bf6be0409189d93c0f87d71ef6db43db82bcd2f7f7e05fb2c6fc2e70ff",
-                    "mixHash" : "0xbeafebb7db18c8d990170e98a504f995fdce0aafc19358c6bab38c23b2b945d2",
-                    "nonce" : "0x29b965ab51fac17c",
+                    "hash" : "0x3f0a8dd7c2726aab2d32789c375fa31ef5c722fd6c1dc12b755bfeae91a668f7",
+                    "mixHash" : "0x7e4ba49f842b8043f4ab5b391674c33e1fac095c36734751381b3ebc0be363f4",
+                    "nonce" : "0xb6a85f2d33c0a365",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
-                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
+                    "stateRoot" : "0x20b140678b95e5d67478398d143dd8cb19426dddea768ec66577385e101b501e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0beafebb7db18c8d990170e98a504f995fdce0aafc19358c6bab38c23b2b945d28829b965ab51fac17cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020b140678b95e5d67478398d143dd8cb19426dddea768ec66577385e101b501ea03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a07e4ba49f842b8043f4ab5b391674c33e1fac095c36734751381b3ebc0be363f488b6a85f2d33c0a365f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -189,7 +182,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x424732bf6be0409189d93c0f87d71ef6db43db82bcd2f7f7e05fb2c6fc2e70ff",
+        "lastblockhash" : "0x3f0a8dd7c2726aab2d32789c375fa31ef5c722fd6c1dc12b755bfeae91a668f7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -208,7 +201,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0f",
+                "balance" : "0x29a2241af62cca0f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -256,7 +249,7 @@
     "delegatecallOOGinCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -268,9 +261,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x7e409616a0b1f9c4bd9b6047521f610cae15b15ae791cde65f5585bc5435a3ec",
-                    "mixHash" : "0x170c338e9dbf69e28f42f91d7167d0576670c1ed2804a47047be517b9037f936",
-                    "nonce" : "0xb79c63b22bc1bc33",
+                    "hash" : "0xb86d62eff3239922a56058e621d0daec6ae2497e2fc9615098596a0206373870",
+                    "mixHash" : "0x21a7a17331267c73958ae9ee80db884105f421f104827719bf31a187465fe81b",
+                    "nonce" : "0x15e7470b84d20463",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
@@ -279,7 +272,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0170c338e9dbf69e28f42f91d7167d0576670c1ed2804a47047be517b9037f93688b79c63b22bc1bc33f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a021a7a17331267c73958ae9ee80db884105f421f104827719bf31a187465fe81b8815e7470b84d20463f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -316,7 +309,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e409616a0b1f9c4bd9b6047521f610cae15b15ae791cde65f5585bc5435a3ec",
+        "lastblockhash" : "0xb86d62eff3239922a56058e621d0daec6ae2497e2fc9615098596a0206373870",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -376,7 +369,7 @@
     "delegatecallOOGinCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -388,9 +381,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0xc660cee410a977e4218a8e3bf20ed25d33e8f0537557d5e700becaa45c47bca4",
-                    "mixHash" : "0xef3f2694f509a766aeb6f0749c4a37f565d8f758b05467edd908a16e9ec4c7d8",
-                    "nonce" : "0x03125f213dece9bd",
+                    "hash" : "0xfb641c1b41904aeeddb4bbd49aeb1ca79da1ae403e5a118af6f03157a8bacda2",
+                    "mixHash" : "0x111e9d6d0e795873f8b644f93e601a2409ea2691de95095ca010bf350df9c838",
+                    "nonce" : "0x48e7658c583a89e1",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
@@ -399,7 +392,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0ef3f2694f509a766aeb6f0749c4a37f565d8f758b05467edd908a16e9ec4c7d88803125f213dece9bdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0111e9d6d0e795873f8b644f93e601a2409ea2691de95095ca010bf350df9c8388848e7658c583a89e1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -436,7 +429,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc660cee410a977e4218a8e3bf20ed25d33e8f0537557d5e700becaa45c47bca4",
+        "lastblockhash" : "0xfb641c1b41904aeeddb4bbd49aeb1ca79da1ae403e5a118af6f03157a8bacda2",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -496,7 +489,7 @@
     "delegatecallOOGinCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -508,9 +501,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x57ece175a64cdb7f4f44e5a7e4fcea147cfdf5cd50dbf5d89cb1c3005c7ddd41",
-                    "mixHash" : "0xcdd7deb4ef570700b998aa88d36ad1844df037f3e15988b7717cd52080ee9670",
-                    "nonce" : "0x1c57579e44f9be4c",
+                    "hash" : "0x633d23e0499a60c5bb758f258897069ce1921b48b28a168e432392a433ec813a",
+                    "mixHash" : "0xc0aa633c83e66553b8d6a1f35dc44b5f1712ff776c70988c3ae9a23405629605",
+                    "nonce" : "0xc10cc0c579ab1890",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
@@ -519,7 +512,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0cdd7deb4ef570700b998aa88d36ad1844df037f3e15988b7717cd52080ee9670881c57579e44f9be4cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c0aa633c83e66553b8d6a1f35dc44b5f1712ff776c70988c3ae9a2340562960588c10cc0c579ab1890f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -556,7 +549,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57ece175a64cdb7f4f44e5a7e4fcea147cfdf5cd50dbf5d89cb1c3005c7ddd41",
+        "lastblockhash" : "0x633d23e0499a60c5bb758f258897069ce1921b48b28a168e432392a433ec813a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "delegatecallOOGinCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xc77b",
-                    "hash" : "0xac8144e4a8b03f30d7861f9388ab11fab103ce502b50ecc414b2be74ad020a8d",
-                    "mixHash" : "0x2e71cb0c715ac5ebcd869e4dea5d55ad0d6dfb3cfb3f35aa190032d90829cc84",
-                    "nonce" : "0x68654a8ced1fcc8e",
+                    "hash" : "0x077a3841d1085f9444350524d38697a26d49772a81e266d62d4f66897c5300de",
+                    "mixHash" : "0xae31f553a6abe9769f50ef2a36f657fef9ac5584e5440ec29cf09255d009a449",
+                    "nonce" : "0x254f1dc914ba8059",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a02e71cb0c715ac5ebcd869e4dea5d55ad0d6dfb3cfb3f35aa190032d90829cc848868654a8ced1fcc8ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a0ae31f553a6abe9769f50ef2a36f657fef9ac5584e5440ec29cf09255d009a44988254f1dc914ba8059f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac8144e4a8b03f30d7861f9388ab11fab103ce502b50ecc414b2be74ad020a8d",
+        "lastblockhash" : "0x077a3841d1085f9444350524d38697a26d49772a81e266d62d4f66897c5300de",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
index f36f6c162..8a58324ef 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallSenderCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xc29a9ba79b2e795a8706350f6ae8943a42274d982486ba5988243192bce5cf8f",
-                    "mixHash" : "0x370f3d6021bae164320f2014233918f689312a7e389a1a93b66b9d9ba32a8f96",
-                    "nonce" : "0xc88161deea8b4d65",
+                    "hash" : "0x8da900be13abce9625cb25a48deed6cd8704a648debfb01ad2453cd6502e009b",
+                    "mixHash" : "0x4ced3dc7915b0ab30383aef30c6b1c327464c8761bfd8cc2868d446ad2a73d7a",
+                    "nonce" : "0x0634eb4959a1b89f",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
+                    "stateRoot" : "0x94c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0370f3d6021bae164320f2014233918f689312a7e389a1a93b66b9d9ba32a8f9688c88161deea8b4d65f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289baa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04ced3dc7915b0ab30383aef30c6b1c327464c8761bfd8cc2868d446ad2a73d7a880634eb4959a1b89ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc29a9ba79b2e795a8706350f6ae8943a42274d982486ba5988243192bce5cf8f",
+        "lastblockhash" : "0x8da900be13abce9625cb25a48deed6cd8704a648debfb01ad2453cd6502e009b",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x29a2241af62cf124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "delegatecallSenderCheck_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x392314e7274c40a6e2e6725c0b3f87626b3e1c181dcb6b94464d7721f5ea8092",
-                    "mixHash" : "0xc0a503bb0ef44abc8547ba2b5f34705e0c93d638e25a41983289eb125372de1e",
-                    "nonce" : "0x7961806eef4cb65a",
+                    "hash" : "0xfde09374f8b1f082998f9123f5c11cfe6d9c8d4faac87541d23f79418539328c",
+                    "mixHash" : "0x52dbef581127e14ad70d68fc75c9246012af3df4b407da8c9eaae1ab25737e11",
+                    "nonce" : "0x46ad386d79603f21",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
+                    "stateRoot" : "0xa892703d074c1111926f7d220ce68d13c2f9fa87246329ccc84b236cffc70e98",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0c0a503bb0ef44abc8547ba2b5f34705e0c93d638e25a41983289eb125372de1e887961806eef4cb65af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a892703d074c1111926f7d220ce68d13c2f9fa87246329ccc84b236cffc70e98a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a052dbef581127e14ad70d68fc75c9246012af3df4b407da8c9eaae1ab25737e118846ad386d79603f21f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x392314e7274c40a6e2e6725c0b3f87626b3e1c181dcb6b94464d7721f5ea8092",
+        "lastblockhash" : "0xfde09374f8b1f082998f9123f5c11cfe6d9c8d4faac87541d23f79418539328c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x29a2241af62cf124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "delegatecallSenderCheck_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xf78cf276c5226443dd397d3a014ac919f9264f153a6186d77e533900d4649774",
-                    "mixHash" : "0x01903714636c09fa56bc2d35974c375fbcf2e5a14b64c2877f0a63b51a6f8ab6",
-                    "nonce" : "0x9c1fdc2b5bc67150",
+                    "hash" : "0xbf351e232b4c04cd688e80a4f32a698cf1356383ab80f3e2c57e66c1394559ca",
+                    "mixHash" : "0x45df34966085a748553c1ae44d395950aa40742d0eac1788e9bd6b7f0f32f294",
+                    "nonce" : "0x7d9a313f26fe1925",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a001903714636c09fa56bc2d35974c375fbcf2e5a14b64c2877f0a63b51a6f8ab6889c1fdc2b5bc67150f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a045df34966085a748553c1ae44d395950aa40742d0eac1788e9bd6b7f0f32f294887d9a313f26fe1925f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf78cf276c5226443dd397d3a014ac919f9264f153a6186d77e533900d4649774",
+        "lastblockhash" : "0xbf351e232b4c04cd688e80a4f32a698cf1356383ab80f3e2c57e66c1394559ca",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "delegatecallSenderCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x9a9ae583ed48797d4798adeffd374d87fd4140f664dc2e3201fd34d573112eba",
-                    "mixHash" : "0xc26915da40f3babe221904bcdebbb0ffc8bd4856393dbedaf71e5bcfdc3af2e1",
-                    "nonce" : "0xdce3cd18a3ef4917",
+                    "hash" : "0x24d3e4f7f16b1ed2a09269c25e813d8eadb567b8159756bcc50125a1d72de4ec",
+                    "mixHash" : "0x52b4a442f27fe3ca9d64717fb28dbc451eecaae5e44fb0f7d13b95da01529367",
+                    "nonce" : "0xa97692f5f4d9a6be",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0c26915da40f3babe221904bcdebbb0ffc8bd4856393dbedaf71e5bcfdc3af2e188dce3cd18a3ef4917f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a052b4a442f27fe3ca9d64717fb28dbc451eecaae5e44fb0f7d13b95da0152936788a97692f5f4d9a6bef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a9ae583ed48797d4798adeffd374d87fd4140f664dc2e3201fd34d573112eba",
+        "lastblockhash" : "0x24d3e4f7f16b1ed2a09269c25e813d8eadb567b8159756bcc50125a1d72de4ec",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "delegatecallSenderCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x642d02c65e49de79a0786ce4bb0da942ce868663447c8c4938df9fd6e385a710",
-                    "mixHash" : "0xccbb9b2a25523b050e5d15f315558bba39d6ad6643b36e2b47abc69575220499",
-                    "nonce" : "0xdbda85af97bc7f8b",
+                    "hash" : "0x958cec7b3494c046da60f59763ad2777ff929d2ffc78ae7ed3467c2e0d7322b0",
+                    "mixHash" : "0xcc5539d78bded0556e7853167e8fbefe61792711c3e82f42be715f27e702bbcf",
+                    "nonce" : "0xd62466619073dba6",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ccbb9b2a25523b050e5d15f315558bba39d6ad6643b36e2b47abc6957522049988dbda85af97bc7f8bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0cc5539d78bded0556e7853167e8fbefe61792711c3e82f42be715f27e702bbcf88d62466619073dba6f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x642d02c65e49de79a0786ce4bb0da942ce868663447c8c4938df9fd6e385a710",
+        "lastblockhash" : "0x958cec7b3494c046da60f59763ad2777ff929d2ffc78ae7ed3467c2e0d7322b0",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "delegatecallSenderCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0x2c6b084d22814564729bbabe5ed89f1e51d92d9a5d46bd635d3af086f5bb120c",
-                    "mixHash" : "0x414a8a62ff87f282c97707fc64ddbdc4dc10f51186d17ff7ac2955357175dea0",
-                    "nonce" : "0x2ce139ab67a8e9ad",
+                    "hash" : "0x7fca38fa9d9e0be0337d9659006ddec35e2fd791d420c99e24e6d67a898c4cc8",
+                    "mixHash" : "0x2c4cb40516fc4851d57fe59178666d6fbe85dbd7791cdbc220b268b67b625f7d",
+                    "nonce" : "0x1f52648dd84aa264",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0414a8a62ff87f282c97707fc64ddbdc4dc10f51186d17ff7ac2955357175dea0882ce139ab67a8e9adf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a02c4cb40516fc4851d57fe59178666d6fbe85dbd7791cdbc220b268b67b625f7d881f52648dd84aa264f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c6b084d22814564729bbabe5ed89f1e51d92d9a5d46bd635d3af086f5bb120c",
+        "lastblockhash" : "0x7fca38fa9d9e0be0337d9659006ddec35e2fd791d420c99e24e6d67a898c4cc8",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
index 02d9a373a..dc1616fd0 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecallValueCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x35faa191d2f331e3696ddc5fdff8036d06758e05583ecabd67ee28575f8c2a5a",
-                    "mixHash" : "0x7e8dbb8bdc36b950302db17134b90424ba5715b84b96a0057594c9ca2cc3f8ed",
-                    "nonce" : "0x8dfda266e6a8049f",
+                    "hash" : "0xfec48660b4f6f81398383d18d844a514572e592c53e214572820744c0c7f254f",
+                    "mixHash" : "0xcc507c3ef0a0cdb0fc1581018fffc0e6cc66ba7a3cfb05330347266d73cc8a76",
+                    "nonce" : "0x4089a473a5fba544",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
+                    "stateRoot" : "0x5329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a07e8dbb8bdc36b950302db17134b90424ba5715b84b96a0057594c9ca2cc3f8ed888dfda266e6a8049ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5ba0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0cc507c3ef0a0cdb0fc1581018fffc0e6cc66ba7a3cfb05330347266d73cc8a76884089a473a5fba544f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35faa191d2f331e3696ddc5fdff8036d06758e05583ecabd67ee28575f8c2a5a",
+        "lastblockhash" : "0xfec48660b4f6f81398383d18d844a514572e592c53e214572820744c0c7f254f",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x29a2241af62cf124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "delegatecallValueCheck_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x27ebb2c32a4c868da2795df67c34455cf684577e8eadc49afc686d656a4f52ac",
-                    "mixHash" : "0xbe95f407391b05003c9310375305376f45c527bbe558a374bd6214c262fa1ca7",
-                    "nonce" : "0x2b92b4a8673fa965",
+                    "hash" : "0xa7cb9bc31bea7e1f3e8b27e21260b6a1f6f7e0b88c32bd28613cf3f0b08c967f",
+                    "mixHash" : "0x4bd1d63ebe4175b009d0e96454b9ce2784d90514b85007f90cfbea065af82eb4",
+                    "nonce" : "0x09cefb5e4ade9ec6",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
+                    "stateRoot" : "0x4239b08927c1663a6809efbea0cf1f2e5881e3d5295a75e00f2bc84814416a91",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0be95f407391b05003c9310375305376f45c527bbe558a374bd6214c262fa1ca7882b92b4a8673fa965f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04239b08927c1663a6809efbea0cf1f2e5881e3d5295a75e00f2bc84814416a91a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04bd1d63ebe4175b009d0e96454b9ce2784d90514b85007f90cfbea065af82eb48809cefb5e4ade9ec6f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27ebb2c32a4c868da2795df67c34455cf684577e8eadc49afc686d656a4f52ac",
+        "lastblockhash" : "0xa7cb9bc31bea7e1f3e8b27e21260b6a1f6f7e0b88c32bd28613cf3f0b08c967f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x29a2241af62cf124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "delegatecallValueCheck_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xd85cf3fb7917213cd665f22cbb9fae697566c6c1c66415ea7f5039bf20c4779a",
-                    "mixHash" : "0x0db5b4b29fe92b47139670acf257501a677267f114f3168c5fc1381225c7834a",
-                    "nonce" : "0x460745b660d2dd03",
+                    "hash" : "0xfc951bbdf40d60b29aa4d51a04bd0467815b60a59926e51488aafd503e4b82a4",
+                    "mixHash" : "0x48d43a9fad23e04eb8663e0366a03ec4eefc7d7616500079a27b88d0262654ee",
+                    "nonce" : "0xd97767c6c9bbba3d",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a00db5b4b29fe92b47139670acf257501a677267f114f3168c5fc1381225c7834a88460745b660d2dd03f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a048d43a9fad23e04eb8663e0366a03ec4eefc7d7616500079a27b88d0262654ee88d97767c6c9bbba3df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd85cf3fb7917213cd665f22cbb9fae697566c6c1c66415ea7f5039bf20c4779a",
+        "lastblockhash" : "0xfc951bbdf40d60b29aa4d51a04bd0467815b60a59926e51488aafd503e4b82a4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "delegatecallValueCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xb0bf93d72ed4446d9704cbdf54a5d8998b82b9d005b1aaf5e29d79fafe6b4467",
-                    "mixHash" : "0xcebccf07d71360317c0b274b4a33b0133b86f666ffdad5e58daba97f2995de34",
-                    "nonce" : "0xb19d6ed07a4371fd",
+                    "hash" : "0xd65b653097778eefdc1f05aeb21798a50d115382be68a9cdf37e723818e614fb",
+                    "mixHash" : "0x5e3c45af619d7524264b3cf12f2f6b876e31803be93de72c5459e13de1eb00ce",
+                    "nonce" : "0x333ce8eef57cc5ea",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0cebccf07d71360317c0b274b4a33b0133b86f666ffdad5e58daba97f2995de3488b19d6ed07a4371fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05e3c45af619d7524264b3cf12f2f6b876e31803be93de72c5459e13de1eb00ce88333ce8eef57cc5eaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0bf93d72ed4446d9704cbdf54a5d8998b82b9d005b1aaf5e29d79fafe6b4467",
+        "lastblockhash" : "0xd65b653097778eefdc1f05aeb21798a50d115382be68a9cdf37e723818e614fb",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "delegatecallValueCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xa145db3a8999cfea53adbde8208e7a77792efdffc6558971129a78247cb7b442",
-                    "mixHash" : "0xce1bb5bdad2140fe492a534901ea32ed583dca98a7395a268b45a601f49adf9b",
-                    "nonce" : "0x920998ac5c7def7f",
+                    "hash" : "0x615b529c200ad6d92f529db125202e703108402aa7fca96899f46462fc0b9500",
+                    "mixHash" : "0xb3432c37d349d8296f2d806915639298c34230acfa786e261e7dfc10179e869b",
+                    "nonce" : "0x7f92c9959c850fe3",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ce1bb5bdad2140fe492a534901ea32ed583dca98a7395a268b45a601f49adf9b88920998ac5c7def7ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0b3432c37d349d8296f2d806915639298c34230acfa786e261e7dfc10179e869b887f92c9959c850fe3f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa145db3a8999cfea53adbde8208e7a77792efdffc6558971129a78247cb7b442",
+        "lastblockhash" : "0x615b529c200ad6d92f529db125202e703108402aa7fca96899f46462fc0b9500",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -619,7 +612,7 @@
     "delegatecallValueCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -631,9 +624,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0xfa32eea9ac80ec7e1d80e15788d1ebd7d7f915df53c110aa2cae88881f8607c9",
-                    "mixHash" : "0xa229f9301520a63e3e6307fbf5cfc9d1ad5b76c84db00a6ef3622436733bfd4d",
-                    "nonce" : "0x0c8f98d81bf6b9e2",
+                    "hash" : "0xe7379376737221d69df4291acb2479f40fe2cc8b628e0a4792669c162e20604c",
+                    "mixHash" : "0x30efebac4ca8695c9a8a5ea8101b01d17a222a2c365596e3a0647a7bc5943c84",
+                    "nonce" : "0x5e191a5b2bee95fd",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
@@ -642,7 +635,7 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0a229f9301520a63e3e6307fbf5cfc9d1ad5b76c84db00a6ef3622436733bfd4d880c8f98d81bf6b9e2f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a030efebac4ca8695c9a8a5ea8101b01d17a222a2c365596e3a0647a7bc5943c84885e191a5b2bee95fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -679,7 +672,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa32eea9ac80ec7e1d80e15788d1ebd7d7f915df53c110aa2cae88881f8607c9",
+        "lastblockhash" : "0xe7379376737221d69df4291acb2479f40fe2cc8b628e0a4792669c162e20604c",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
index 3252a88d6..e93d7aa9f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x11d349f477a4b3587227d53d94ef54f0cdfd7ee4da55a6d0ca47af7ec27d4c4a",
-                    "mixHash" : "0x1c3ea5c72cb20787f563b8493b542334b9eff4e3ad31c1df9fb9a29b91e0b184",
-                    "nonce" : "0xbd0087ecc82be34f",
+                    "hash" : "0x76e219239e1ea23fee9da471a7471c7cd6d7ddb4440bf69e696288c108878efd",
+                    "mixHash" : "0x177c53fbe4c0c001675a8f8490b73a4ae7ed01bc2bbcb79a1b33e92016691354",
+                    "nonce" : "0xddcd59286ade3dc9",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
-                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
+                    "stateRoot" : "0x0c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a01c3ea5c72cb20787f563b8493b542334b9eff4e3ad31c1df9fb9a29b91e0b18488bd0087ecc82be34ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0177c53fbe4c0c001675a8f8490b73a4ae7ed01bc2bbcb79a1b33e9201669135488ddcd59286ade3dc9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11d349f477a4b3587227d53d94ef54f0cdfd7ee4da55a6d0ca47af7ec27d4c4a",
+        "lastblockhash" : "0x76e219239e1ea23fee9da471a7471c7cd6d7ddb4440bf69e696288c108878efd",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -89,7 +82,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e45",
+                "balance" : "0x29a2241af62d6e45",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -123,7 +116,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x5ed0280b7000310695c8c25085611429e7531f0f75582480c4496cc5c8442a69",
-                    "mixHash" : "0x3c491d5f56023203ef8314589d9340850bce9f8b6c48d7982cd90d310c922674",
-                    "nonce" : "0x12d4ffdf23dc1eb7",
+                    "hash" : "0xd7699e1d9e8400b3456eec53fcef2c32f50ce194be25311bd260d03c82dca8d8",
+                    "mixHash" : "0x38978c4a595b408567ad4ceb4cc20a171c279a72932085a0d667e026ad71966b",
+                    "nonce" : "0x7d2df44a9ceefa79",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
-                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
+                    "stateRoot" : "0x7c1a7c4a64b879d48d3c94f7985d6d774332482a43f0b03f081e381d62d74e20",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a03c491d5f56023203ef8314589d9340850bce9f8b6c48d7982cd90d310c9226748812d4ffdf23dc1eb7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c1a7c4a64b879d48d3c94f7985d6d774332482a43f0b03f081e381d62d74e20a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a038978c4a595b408567ad4ceb4cc20a171c279a72932085a0d667e026ad71966b887d2df44a9ceefa79f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,7 +176,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ed0280b7000310695c8c25085611429e7531f0f75582480c4496cc5c8442a69",
+        "lastblockhash" : "0xd7699e1d9e8400b3456eec53fcef2c32f50ce194be25311bd260d03c82dca8d8",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -210,7 +203,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e45",
+                "balance" : "0x29a2241af62d6e45",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -244,7 +237,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -256,9 +249,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0xf6a3be601d2ea92893e9ae4d1b6cf4ae968d5ffdf300c6076662dcbf65121258",
-                    "mixHash" : "0x6eef8228faeacb1538a4bccfe48cc6fe56da87c6364a5d98fd11e4afcca502c9",
-                    "nonce" : "0x5bd6ddcdf3b19c0a",
+                    "hash" : "0x4b82ca08eb40a6fd2bf339c4d7e9cec5aace8aecb89c94587b529c0e358b4258",
+                    "mixHash" : "0x468ff63de9991c03fbbc3b90f78932116742187bf010b6a9d2a62ebee30cd18e",
+                    "nonce" : "0x136695a98cc341b4",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
@@ -267,7 +260,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a06eef8228faeacb1538a4bccfe48cc6fe56da87c6364a5d98fd11e4afcca502c9885bd6ddcdf3b19c0af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0468ff63de9991c03fbbc3b90f78932116742187bf010b6a9d2a62ebee30cd18e88136695a98cc341b4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,7 +297,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6a3be601d2ea92893e9ae4d1b6cf4ae968d5ffdf300c6076662dcbf65121258",
+        "lastblockhash" : "0x4b82ca08eb40a6fd2bf339c4d7e9cec5aace8aecb89c94587b529c0e358b4258",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -358,7 +351,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -370,9 +363,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x604f2380b80cb5add4772d81879f45192b74200e4079d9cf5ddfea1dbd367d1d",
-                    "mixHash" : "0x4d22ca815618d704a9fef31071689957f00d1837d4abbb730df5ed3dc8e1c2ed",
-                    "nonce" : "0xcf268a16c417b31b",
+                    "hash" : "0x71a9c041d9d765bf1c339a75239f08e3408d283b80aea4458bb4fcd0ebdaf372",
+                    "mixHash" : "0x8a56314f7307ecf59fb1ca540b7a429dfddf6d470f55bb685e6147892ad63029",
+                    "nonce" : "0xe9542b9a65c5e099",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
@@ -381,7 +374,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a04d22ca815618d704a9fef31071689957f00d1837d4abbb730df5ed3dc8e1c2ed88cf268a16c417b31bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a08a56314f7307ecf59fb1ca540b7a429dfddf6d470f55bb685e6147892ad6302988e9542b9a65c5e099f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -418,7 +411,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x604f2380b80cb5add4772d81879f45192b74200e4079d9cf5ddfea1dbd367d1d",
+        "lastblockhash" : "0x71a9c041d9d765bf1c339a75239f08e3408d283b80aea4458bb4fcd0ebdaf372",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -472,7 +465,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -484,9 +477,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0x7473e1ed284f386975eaeacc64bfdb9201a78411857e8ccfe1fefe7cd2f9d3f9",
-                    "mixHash" : "0xd72e986442ed29cfe943250b99c80a229ec9b0a0c182c67aeae91a18219f88db",
-                    "nonce" : "0xd75686dc6b8f417c",
+                    "hash" : "0x52c1f0868031a6bed0bd60a4da6420d6f69516f7990fdd970a5b7f1d8c0ed9a8",
+                    "mixHash" : "0x5926c2825b8658a5fabb5d270bf1b7e287b46ffdcbb46dca9ec0233eddc27662",
+                    "nonce" : "0x133887eb2e59c64f",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
@@ -495,7 +488,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0d72e986442ed29cfe943250b99c80a229ec9b0a0c182c67aeae91a18219f88db88d75686dc6b8f417cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a05926c2825b8658a5fabb5d270bf1b7e287b46ffdcbb46dca9ec0233eddc2766288133887eb2e59c64ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -532,7 +525,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7473e1ed284f386975eaeacc64bfdb9201a78411857e8ccfe1fefe7cd2f9d3f9",
+        "lastblockhash" : "0x52c1f0868031a6bed0bd60a4da6420d6f69516f7990fdd970a5b7f1d8c0ed9a8",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -577,7 +570,7 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -589,9 +582,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb1",
-                    "hash" : "0xf1421c81daaeeae6fcb58cdc311a9a9c4268721e1022b2072d11ef2e39c2fdbb",
-                    "mixHash" : "0x4ec345627965db8e7faa73844d37364febfac9b0f8aeb06f36485862518de98c",
-                    "nonce" : "0x5c83e8f1af404637",
+                    "hash" : "0x9b80c038e29e33c3d879b3b34884d86cb06b7dbfff05636c12e3578769caba16",
+                    "mixHash" : "0x2d38ffc4999867b773b5c93efc0d59ea68445d71f2328365f64da5c9b07adb69",
+                    "nonce" : "0x984f21b887e5f904",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
@@ -600,7 +593,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a04ec345627965db8e7faa73844d37364febfac9b0f8aeb06f36485862518de98c885c83e8f1af404637f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a02d38ffc4999867b773b5c93efc0d59ea68445d71f2328365f64da5c9b07adb6988984f21b887e5f904f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -637,7 +630,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1421c81daaeeae6fcb58cdc311a9a9c4268721e1022b2072d11ef2e39c2fdbb",
+        "lastblockhash" : "0x9b80c038e29e33c3d879b3b34884d86cb06b7dbfff05636c12e3578769caba16",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
index e5c19a37d..4a5e2600b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
@@ -2,7 +2,7 @@
     "delegatecodeDynamicCode_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0x429590fc2f1ea34ad257915975a1a425eec74b4c16b9254ca0980ce5a9f7dff8",
-                    "mixHash" : "0x9620d985cb6d77b42006cf178498a6c3f017f6863f13ca14b16c38496d9b144b",
-                    "nonce" : "0x66c41f73d5fb14c6",
+                    "hash" : "0xbc9d2055d24455b711c4f69f7573295ec874933a1e3e5c2885cc6bd73c3e6d90",
+                    "mixHash" : "0x3a1252f0a5972a6f79062a2b5c91d4eaa2ef9e972ad211aa1a3e9ab07ac955b8",
+                    "nonce" : "0xdf2b9f5b89b15f44",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
-                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
+                    "stateRoot" : "0x00c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a09620d985cb6d77b42006cf178498a6c3f017f6863f13ca14b16c38496d9b144b8866c41f73d5fb14c6f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a03a1252f0a5972a6f79062a2b5c91d4eaa2ef9e972ad211aa1a3e9ab07ac955b888df2b9f5b89b15f44f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x429590fc2f1ea34ad257915975a1a425eec74b4c16b9254ca0980ce5a9f7dff8",
+        "lastblockhash" : "0xbc9d2055d24455b711c4f69f7573295ec874933a1e3e5c2885cc6bd73c3e6d90",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -89,7 +82,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f27b",
+                "balance" : "0x29a2241af62df27b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "delegatecodeDynamicCode_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0x64579d3f6e252482066fe0929725d673f0066c989ff4a665a917403cd80e1e25",
-                    "mixHash" : "0xbca91ce9cef0a011d68d5cab927c785a71953b7fa2e44b590fe377e304080c59",
-                    "nonce" : "0x67230b4fb6b0ec1d",
+                    "hash" : "0xfab5adfa3ccf3d98445c2f95bc805122982cd4579fab8659225e0757c51450d0",
+                    "mixHash" : "0xebb0b384001c1f06e1961fe2df5ec80d0273eb6d5a3819a578fedc0abcc6e869",
+                    "nonce" : "0xa6633424d3faf767",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
-                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
+                    "stateRoot" : "0x1a3333c68f2e8eb33e9729568fc5453c706be4917d9434e8cc79955fa06ff54a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0bca91ce9cef0a011d68d5cab927c785a71953b7fa2e44b590fe377e304080c598867230b4fb6b0ec1df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a3333c68f2e8eb33e9729568fc5453c706be4917d9434e8cc79955fa06ff54aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0ebb0b384001c1f06e1961fe2df5ec80d0273eb6d5a3819a578fedc0abcc6e86988a6633424d3faf767f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x64579d3f6e252482066fe0929725d673f0066c989ff4a665a917403cd80e1e25",
+        "lastblockhash" : "0xfab5adfa3ccf3d98445c2f95bc805122982cd4579fab8659225e0757c51450d0",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -217,7 +210,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f27b",
+                "balance" : "0x29a2241af62df27b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "delegatecodeDynamicCode_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028ec6",
-                    "hash" : "0xe0dc962a624e643535c6769adee11566f276dea22d2cb7dce6668c8730704233",
-                    "mixHash" : "0x43080f632be0bd7e88614f1cd02ac69589230942bebde34df866977b7300489e",
-                    "nonce" : "0xacdcb80a085a5ac8",
+                    "hash" : "0xe2d1c4047fa8215938945a36c3ca6297095c54f9bbb1ec59d18fb0eb6f6d8661",
+                    "mixHash" : "0x0f630d16836fa5ac99d6c42ede8a13a4e4e15610e412163ee3733c676b61e24e",
+                    "nonce" : "0xd9621a6c27f3afa7",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a043080f632be0bd7e88614f1cd02ac69589230942bebde34df866977b7300489e88acdcb80a085a5ac8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a00f630d16836fa5ac99d6c42ede8a13a4e4e15610e412163ee3733c676b61e24e88d9621a6c27f3afa7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0dc962a624e643535c6769adee11566f276dea22d2cb7dce6668c8730704233",
+        "lastblockhash" : "0xe2d1c4047fa8215938945a36c3ca6297095c54f9bbb1ec59d18fb0eb6f6d8661",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -381,7 +374,7 @@
     "delegatecodeDynamicCode_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -393,9 +386,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0x92b4cd8376d86f643b8dbf457781ec39d18c74f917fb444b6c9bc0fd9f72a4f6",
-                    "mixHash" : "0x58041d76bf3a577fde060e0ad84f339a799e147b9b9cca21b6255ad23120880d",
-                    "nonce" : "0xf3e1b7c75531a763",
+                    "hash" : "0xbe7332a8e58c68706fe3e1f97f4b1e8c320797fdb11568d11b2222bb798a20fc",
+                    "mixHash" : "0xdd43d0183d23247ffa684be91c6c7d310dd76e703ff147ee298173f53d9615cf",
+                    "nonce" : "0x435786d123f13035",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
@@ -404,7 +397,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a058041d76bf3a577fde060e0ad84f339a799e147b9b9cca21b6255ad23120880d88f3e1b7c75531a763f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0dd43d0183d23247ffa684be91c6c7d310dd76e703ff147ee298173f53d9615cf88435786d123f13035f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -441,7 +434,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92b4cd8376d86f643b8dbf457781ec39d18c74f917fb444b6c9bc0fd9f72a4f6",
+        "lastblockhash" : "0xbe7332a8e58c68706fe3e1f97f4b1e8c320797fdb11568d11b2222bb798a20fc",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -502,7 +495,7 @@
     "delegatecodeDynamicCode_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -514,9 +507,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x06e9d9",
-                    "hash" : "0xb71b7c1505f83d1fbc87d3b8d36153bc066844997adba1bb0416ad20e72f9c73",
-                    "mixHash" : "0x2b6063ae8186cbc330093c08141f135c5e95fbf2c1bbc85fe09f7922b71d740c",
-                    "nonce" : "0x7e86c63271644298",
+                    "hash" : "0x7189666ffb41ee9eb6ea8d55484a5991a1ffd44aaf0fb9d3bcc0fc547db1cabc",
+                    "mixHash" : "0xcc580d71b8c5b783a5c011173f8939c73c51527a2946b6f5e4e015e6de0eaff6",
+                    "nonce" : "0xc496cd67eafed6e1",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
@@ -525,7 +518,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02b6063ae8186cbc330093c08141f135c5e95fbf2c1bbc85fe09f7922b71d740c887e86c63271644298f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0cc580d71b8c5b783a5c011173f8939c73c51527a2946b6f5e4e015e6de0eaff688c496cd67eafed6e1f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -562,7 +555,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb71b7c1505f83d1fbc87d3b8d36153bc066844997adba1bb0416ad20e72f9c73",
+        "lastblockhash" : "0x7189666ffb41ee9eb6ea8d55484a5991a1ffd44aaf0fb9d3bcc0fc547db1cabc",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -607,7 +600,7 @@
     "delegatecodeDynamicCode_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -619,9 +612,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c32",
-                    "hash" : "0xbb0af3d44a4eab278339094f1ddf7ec34356b800fa0d19052614c0438efb3907",
-                    "mixHash" : "0xfdf2c64521d2ce614fc84bd6492db998b453ab2a89cf82119fcbbc131ed89b0e",
-                    "nonce" : "0x5608c923d4e35d07",
+                    "hash" : "0x6e7dbce62117c5b7bdcd840634c68eb89702d23004dd4825a49510ced0c8f6aa",
+                    "mixHash" : "0x5f91867b3082c2055937b07de20ef39d27dc9f49c2c5f8d0718b68d1c22344a5",
+                    "nonce" : "0x82b058c27e5bd0dc",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
@@ -630,7 +623,7 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a0fdf2c64521d2ce614fc84bd6492db998b453ab2a89cf82119fcbbc131ed89b0e885608c923d4e35d07f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a05f91867b3082c2055937b07de20ef39d27dc9f49c2c5f8d0718b68d1c22344a58882b058c27e5bd0dcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -667,7 +660,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb0af3d44a4eab278339094f1ddf7ec34356b800fa0d19052614c0438efb3907",
+        "lastblockhash" : "0x6e7dbce62117c5b7bdcd840634c68eb89702d23004dd4825a49510ced0c8f6aa",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {