Hive tests with Byzantine

40 files changed, 7274 insertions, 2305 deletions

diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
index 0b13d7176..c8e723daa 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Call1024BalanceTooLow_d0g0v0_EIP150" : {
+    "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x3ef7f90ef324da4af17f1babbad5b2714818f6de3b8200d3e8f5d7357f123a43",
-                    "mixHash" : "0x29246ae817bbf3e10c86589e37f61e01d0f86464e2761bf8fb3715713dea98bb",
-                    "nonce" : "0x098a5d20726b2f7a",
+                    "hash" : "0xc428946c500cd6298994a51f188b86969cca9359ec56b28c0e0275f10274680e",
+                    "mixHash" : "0xcfe6ed9c8956c9502018745a1c10f9b2e21fb40e38a28889815e71921a876d58",
+                    "nonce" : "0x71570b7404e38cb4",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a029246ae817bbf3e10c86589e37f61e01d0f86464e2761bf8fb3715713dea98bb88098a5d20726b2f7af865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0cfe6ed9c8956c9502018745a1c10f9b2e21fb40e38a28889815e71921a876d588871570b7404e38cb4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ef7f90ef324da4af17f1babbad5b2714818f6de3b8200d3e8f5d7357f123a43",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc428946c500cd6298994a51f188b86969cca9359ec56b28c0e0275f10274680e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_EIP158" : {
+    "Call1024BalanceTooLow_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x18e3a7edcaae8a0b5a5d77121f22a3c770c009aa14ae95c99bbb5aaf58316471",
-                    "mixHash" : "0x40f9f1ea0c7220d976fe09a58a9d857ac330baefabeb79619b4f4b449d44e588",
-                    "nonce" : "0x69bfea58b912b270",
+                    "hash" : "0x3895f0e9b02235db864cad9887db3f693e2e1144509bfee7316ead0a1f0676f2",
+                    "mixHash" : "0xf0501016b317713194e57eb2ef4b4a35355fc08a6e9ece1cdee48056cb4ebb0d",
+                    "nonce" : "0x4b7d5954ce3b8178",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a040f9f1ea0c7220d976fe09a58a9d857ac330baefabeb79619b4f4b449d44e5888869bfea58b912b270f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f0501016b317713194e57eb2ef4b4a35355fc08a6e9ece1cdee48056cb4ebb0d884b7d5954ce3b8178f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18e3a7edcaae8a0b5a5d77121f22a3c770c009aa14ae95c99bbb5aaf58316471",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3895f0e9b02235db864cad9887db3f693e2e1144509bfee7316ead0a1f0676f2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_Frontier" : {
+    "Call1024BalanceTooLow_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d788",
-                    "hash" : "0xb147f27690e285eb0aa06644964efd777982f86f51ebe2d2e3dcc3c0a1e939e0",
-                    "mixHash" : "0xe1874e104764adf9c637ca6982bcbf83f26b2304894c2168ae9f7f16eb7dd48c",
-                    "nonce" : "0x38cdf6a6ab981a71",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0xf2530ac24e55b0b3c5b6abd4075585a397fc0376d8cf118cb02aeb38aa728e00",
+                    "mixHash" : "0xe79d12cb56ee017780c5f9a9e813cabd2ca688e9e07c619726bdc0e5f60f8c6a",
+                    "nonce" : "0x78cdf32b59ba435c",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
-                    "stateRoot" : "0x2ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a0e1874e104764adf9c637ca6982bcbf83f26b2304894c2168ae9f7f16eb7dd48c8838cdf6a6ab981a71f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0e79d12cb56ee017780c5f9a9e813cabd2ca688e9e07c619726bdc0e5f60f8c6a8878cdf32b59ba435cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +318,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb147f27690e285eb0aa06644964efd777982f86f51ebe2d2e3dcc3c0a1e939e0",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf2530ac24e55b0b3c5b6abd4075585a397fc0376d8cf118cb02aeb38aa728e00",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff2877",
+                "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -322,17 +336,19 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4d788",
+                "balance" : "0x45639182459fc5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
                 }
             }
         },
@@ -360,10 +376,10 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_Homestead" : {
+    "Call1024BalanceTooLow_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x35c6d0a82c461a940f008fe5c27f6fa089487dad96e739740f3a3ac431754719",
-                    "mixHash" : "0xc73435d52a0c58f2dd619d1b2fe09dbc85ccd4349c9bb4597188f63ac050a790",
-                    "nonce" : "0xadee808296369124",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0x8548086194dd0c6b25364db9aa97025c388f9c6ecae8e61468d8e97e3dbf7555",
+                    "mixHash" : "0xd50861bb44f57f5645f375c31cb46039c66424d60da300cc46d757391e7b35bd",
+                    "nonce" : "0xd654051fcea5fb5e",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
-                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0c73435d52a0c58f2dd619d1b2fe09dbc85ccd4349c9bb4597188f63ac050a79088adee808296369124f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0d50861bb44f57f5645f375c31cb46039c66424d60da300cc46d757391e7b35bd88d654051fcea5fb5ef865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35c6d0a82c461a940f008fe5c27f6fa089487dad96e739740f3a3ac431754719",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8548086194dd0c6b25364db9aa97025c388f9c6ecae8e61468d8e97e3dbf7555",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff4bcb",
+                "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -441,7 +457,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4b42a",
+                "balance" : "0x45639182459fc5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -452,7 +468,8 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
                 }
             }
         },
@@ -480,10 +497,10 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_Metropolis" : {
+    "Call1024BalanceTooLow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -494,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x8077fac817114ff7d75b08f307bfb2175ad01527e632ab91abeb5b20bad44a86",
-                    "mixHash" : "0x3afc56b161245490850d97af45d40d4da29dbbd7c91bff0d65aa2eaab7083bd0",
-                    "nonce" : "0x32b775bb02c35a84",
+                    "gasUsed" : "0x10000000d788",
+                    "hash" : "0x7adf9cf26c9853d09b4ef2109f14000482383f9cd89cf541742fa57b0bbc513d",
+                    "mixHash" : "0x0a325fa755a87adc5a14974c7e0b26a6c1b5d4d16cb2474289cc490b8fd5768c",
+                    "nonce" : "0xf653c4519202713f",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
+                    "stateRoot" : "0x2ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a03afc56b161245490850d97af45d40d4da29dbbd7c91bff0d65aa2eaab7083bd08832b775bb02c35a84f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a00a325fa755a87adc5a14974c7e0b26a6c1b5d4d16cb2474289cc490b8fd5768c88f653c4519202713ff865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -543,18 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8077fac817114ff7d75b08f307bfb2175ad01527e632ab91abeb5b20bad44a86",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7adf9cf26c9853d09b4ef2109f14000482383f9cd89cf541742fa57b0bbc513d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffefffffff2877",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563a18244f4d788",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024BalanceTooLow_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x10000000b42a",
+                    "hash" : "0xb4b50b39207916f6ba2f8c0813c2091740c6b312a1ab390ce1b8b7338d8484b2",
+                    "mixHash" : "0xde0c92016d4258a2b9f241892c37be6566a333438e69ff7e22f9f3aff279f036",
+                    "nonce" : "0x15f4c67ec52fd530",
+                    "number" : "0x01",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
+                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0de0c92016d4258a2b9f241892c37be6566a333438e69ff7e22f9f3aff279f0368815f4c67ec52fd530f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x10000000d788",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
+                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb4b50b39207916f6ba2f8c0813c2091740c6b312a1ab390ce1b8b7338d8484b2",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
+                "balance" : "0xffffffffffffffffffffefffffff4bcb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -568,7 +697,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x4563a18244f4b42a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -579,8 +708,7 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
+                    "0x00" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
index 9f5af1544..c45edd277 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Call1024OOG_d0g0v0_EIP150" : {
+    "Call1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xec2caf8e458716117b37771ce9aff25a532bf94606d10749744c6132bee459e9",
-                    "mixHash" : "0xe58ef12ef674b080552dbd150b5b2641bfc9ac552d393ce6e76dc8a3cafce552",
-                    "nonce" : "0x336993eaa053fe80",
+                    "hash" : "0xa824749eb37a61d08e79750c3496c77a3ccb99f8541bfe82566725e43b3aac17",
+                    "mixHash" : "0xf0dd71e693be6fd730242f7bd463941f0d7e5c6e3901477db4bbc3a96002143e",
+                    "nonce" : "0x832d0a35cc664da5",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0e58ef12ef674b080552dbd150b5b2641bfc9ac552d393ce6e76dc8a3cafce55288336993eaa053fe80f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0f0dd71e693be6fd730242f7bd463941f0d7e5c6e3901477db4bbc3a96002143e88832d0a35cc664da5f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec2caf8e458716117b37771ce9aff25a532bf94606d10749744c6132bee459e9",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa824749eb37a61d08e79750c3496c77a3ccb99f8541bfe82566725e43b3aac17",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_EIP158" : {
+    "Call1024OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,18 +143,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x3a8939f7daf93e29e4c7b13fa9935763af7b56e50eec0ce39ae5db0169c90444",
-                    "mixHash" : "0x02479f1dceebcba82022c886945863c122339c69a10b01f3b8b3ee0eae4b05b9",
-                    "nonce" : "0x36ed9aad2d61efe8",
+                    "hash" : "0x8dd70dec2d0180afee5b673dc4e8ea3c803919dcf7cb7091202f1198b21ca032",
+                    "mixHash" : "0x1853cf9b2eb54bad9c9068e0f451be8870694b73a69e819b9a9aa3fa139957e0",
+                    "nonce" : "0x650452f77a64f545",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a002479f1dceebcba82022c886945863c122339c69a10b01f3b8b3ee0eae4b05b98836ed9aad2d61efe8f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a01853cf9b2eb54bad9c9068e0f451be8870694b73a69e819b9a9aa3fa139957e088650452f77a64f545f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,9 +191,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a8939f7daf93e29e4c7b13fa9935763af7b56e50eec0ce39ae5db0169c90444",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8dd70dec2d0180afee5b673dc4e8ea3c803919dcf7cb7091202f1198b21ca032",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -243,10 +257,10 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_Frontier" : {
+    "Call1024OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +271,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe17a",
-                    "hash" : "0x77c1488570d049afb713c662c41f8ea725a5d174054f1d6e382b532fe3c41f59",
-                    "mixHash" : "0xd48f8016189872c867e1e7d920fcc86568081223120c19cd37a6f97c35405857",
-                    "nonce" : "0x85a8ebb4d22cfa19",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0xc63733700531b121dd516008bffcfe2457b5da6af4a41f112e9f05c680ac3663",
+                    "mixHash" : "0xdb6d2202c025d0a950806a632d802dfaf09b8447a639071b1fca0209afed1459",
+                    "nonce" : "0x6d98ff819bdd24be",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0d48f8016189872c867e1e7d920fcc86568081223120c19cd37a6f97c354058578885a8ebb4d22cfa19f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0db6d2202c025d0a950806a632d802dfaf09b8447a639071b1fca0209afed1459886d98ff819bdd24bef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,11 +320,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77c1488570d049afb713c662c41f8ea725a5d174054f1d6e382b532fe3c41f59",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc63733700531b121dd516008bffcfe2457b5da6af4a41f112e9f05c680ac3663",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e85",
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -324,17 +338,20 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e17a",
+                "balance" : "0x45639182452e8720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x85",
+                    "0x01" : "0x01",
+                    "0x02" : "0x020789"
                 }
             }
         },
@@ -362,10 +379,10 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_Homestead" : {
+    "Call1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefd576",
-                    "hash" : "0xbff05e89ef5d03bfe466e0cabdbf3b52d5a87551bbd03bb37cafc7a939c20137",
-                    "mixHash" : "0x158535bc4e7f9b98f83f3e75863b8bfdbeb1d03ecf3d43423d401608e7548635",
-                    "nonce" : "0xe0f7de81f0331cdd",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0x8f7636342cad9670804550336f4ab287a89980fb27137fa2426141cc8d43bd40",
+                    "mixHash" : "0x37161f27027804fb59dcfc1649c02ab461967cadeec76da14c1990746f06c204",
+                    "nonce" : "0x2633c82ae3bb8d13",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
-                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0158535bc4e7f9b98f83f3e75863b8bfdbeb1d03ecf3d43423d401608e754863588e0f7de81f0331cddf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a037161f27027804fb59dcfc1649c02ab461967cadeec76da14c1990746f06c204882633c82ae3bb8d13f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,11 +442,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbff05e89ef5d03bfe466e0cabdbf3b52d5a87551bbd03bb37cafc7a939c20137",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8f7636342cad9670804550336f4ab287a89980fb27137fa2426141cc8d43bd40",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff102a7f",
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,7 +460,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3d576",
+                "balance" : "0x45639182452e8720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -454,9 +471,9 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0401",
+                    "0x00" : "0x85",
                     "0x01" : "0x01",
-                    "0x02" : "0x0fa3e9"
+                    "0x02" : "0x020789"
                 }
             }
         },
@@ -484,10 +501,10 @@
             }
         }
     },
-    "Call1024OOG_d0g0v0_Metropolis" : {
+    "Call1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,19 +515,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0xb28945329c0c37d1524914d311ccd471f9c1019ee8a3a7d955b2128bb71e7a58",
-                    "mixHash" : "0x426b2d840a6401c5533fe7a18d6ba678816e08280ffb69a4d4c5cef6d12460ee",
-                    "nonce" : "0xa7153442c8b06956",
+                    "gasUsed" : "0xefe17a",
+                    "hash" : "0x99f1071f416f9c10bb800bfddf60aa5149dff5f95eafbe0860d257f9594604e8",
+                    "mixHash" : "0xd140af099cd05f50b0fdb8ae99e5252ea8729245ce719aba66e003955eb43cf7",
+                    "nonce" : "0x4686b14d3fed291e",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
+                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0426b2d840a6401c5533fe7a18d6ba678816e08280ffb69a4d4c5cef6d12460ee88a7153442c8b06956f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0d140af099cd05f50b0fdb8ae99e5252ea8729245ce719aba66e003955eb43cf7884686b14d3fed291ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -547,18 +564,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb28945329c0c37d1524914d311ccd471f9c1019ee8a3a7d955b2128bb71e7a58",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x99f1071f416f9c10bb800bfddf60aa5149dff5f95eafbe0860d257f9594604e8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff101e85",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918245e3e17a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xefd576",
+                    "hash" : "0x7e747b0f6581435fe50fbc152b22b93ba9905dc525d30870674c5be1f964d633",
+                    "mixHash" : "0x602045a61cfa2fd55708a97411ac999596ef7906db544f051b60c552d586efd3",
+                    "nonce" : "0x064f3c010e6318c5",
+                    "number" : "0x01",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
+                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0602045a61cfa2fd55708a97411ac999596ef7906db544f051b60c552d586efd388064f3c010e6318c5f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xefe17a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
+                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7e747b0f6581435fe50fbc152b22b93ba9905dc525d30870674c5be1f964d633",
+        "network" : "Homestead",
+        "postState" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff102a7f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -572,7 +701,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x4563918245e3d576",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -583,9 +712,9 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x85",
+                    "0x00" : "0x0401",
                     "0x01" : "0x01",
-                    "0x02" : "0x020789"
+                    "0x02" : "0x0fa3e9"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
index 4dd7f2ff6..62df8ea20 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Call1024PreCalls_d0g0v0_EIP150" : {
+    "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x15a5a6e5873c5b0c1530ee62d2040574306ba8afabb75c2ce7f550e35524e973",
-                    "mixHash" : "0x9b8c9696df473b0387a0239b3ea6d61b5acead7f6ccd801b82ecc553228e0b0e",
-                    "nonce" : "0x167440cc53d9d4c0",
+                    "hash" : "0x3ab3cbbf095335f5e54f581e21b8be5b01eb60d31803ecaed46b2bceb74d2010",
+                    "mixHash" : "0x0980ffabe445e3ccfeda7a21e1b92b3ea46bfe2a759766f7d661d2af076a2096",
+                    "nonce" : "0x8ca8ec9cdd2e09ab",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
+                    "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
+                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a09b8c9696df473b0387a0239b3ea6d61b5acead7f6ccd801b82ecc553228e0b0e88167440cc53d9d4c0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a00980ffabe445e3ccfeda7a21e1b92b3ea46bfe2a759766f7d661d2af076a2096888ca8ec9cdd2e09abf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15a5a6e5873c5b0c1530ee62d2040574306ba8afabb75c2ce7f550e35524e973",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3ab3cbbf095335f5e54f581e21b8be5b01eb60d31803ecaed46b2bceb74d2010",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
                 "code" : "",
@@ -122,10 +129,10 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_EIP158" : {
+    "Call1024PreCalls_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,18 +144,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x9d012bc7182d19764663c30ccf0b8093ec0494d409bd96a1973359745d4daadb",
-                    "mixHash" : "0x2fce36ece9bea962e42dc12c8855f33013169b8a862af36e01b6fec4ebdb4bb9",
-                    "nonce" : "0x93b537e691a772da",
+                    "hash" : "0x8a1763b1e7b31e48aea5b8005f461e8f472f6db20c2d4d5a76dc6f5c3f526799",
+                    "mixHash" : "0x204187617e3d1e3043e98017caaf40e35eefd6133b4d79d27e9ead0d3b581678",
+                    "nonce" : "0xb7e330a35eb0ee1e",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
+                    "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
+                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a02fce36ece9bea962e42dc12c8855f33013169b8a862af36e01b6fec4ebdb4bb98893b537e691a772daf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0204187617e3d1e3043e98017caaf40e35eefd6133b4d79d27e9ead0d3b58167888b7e330a35eb0ee1ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -185,9 +192,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d012bc7182d19764663c30ccf0b8093ec0494d409bd96a1973359745d4daadb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8a1763b1e7b31e48aea5b8005f461e8f472f6db20c2d4d5a76dc6f5c3f526799",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
                 "code" : "",
@@ -245,10 +259,10 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_Frontier" : {
+    "Call1024PreCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -259,19 +273,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x45b322cd666a00aeaa0d901f30e0cedc84109f4d2600534146a6a27bb3b790ad",
-                    "mixHash" : "0xe447eafd680abc79b5c3810644f2cfce71be76353b1555f3f78369c30df0b59b",
-                    "nonce" : "0xc8439f6ff8a8fdf4",
+                    "gasUsed" : "0x022d79b7",
+                    "hash" : "0x37ed0661bbdbfb1646be16a763c01cec234a047e47e0ebb68bdead22041c1192",
+                    "mixHash" : "0x1f43184aacdb4d035a03a6957e53c9118d07112c7a22d1bf47d4f9084061fddb",
+                    "nonce" : "0x6076c73ce95cb86d",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
-                    "stateRoot" : "0xccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1",
+                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
+                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0e447eafd680abc79b5c3810644f2cfce71be76353b1555f3f78369c30df0b59b88c8439f6ff8a8fdf4f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a01f43184aacdb4d035a03a6957e53c9118d07112c7a22d1bf47d4f9084061fddb886076c73ce95cb86df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -308,35 +322,39 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45b322cd666a00aeaa0d901f30e0cedc84109f4d2600534146a6a27bb3b790ad",
-        "network" : "Frontier",
+        "lastblockhash" : "0x37ed0661bbdbfb1646be16a763c01cec234a047e47e0ebb68bdead22041c1192",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffff800000000000000f",
+                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
+                "balance" : "0x2320",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x45639182472179b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
+                "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x03e4",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01"
                 }
             }
         },
@@ -364,10 +382,10 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_Homestead" : {
+    "Call1024PreCalls_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -378,19 +396,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x100000018542",
-                    "hash" : "0x9bd7b6ab536796b5f05ac99c2b0503209aee6201ebcbadfc1da3fb7b08c52067",
-                    "mixHash" : "0x406a707b709a43b1185e3144a40c7dce2b2566aa9e67fa73858a899c5fb6e14a",
-                    "nonce" : "0x933c0ed6a744664f",
+                    "gasUsed" : "0x022d79b7",
+                    "hash" : "0xe8764d2e77217b490bcbf2264611e1dd04488c3a53d709efd64d73eee08e624a",
+                    "mixHash" : "0x1ca07bb68cfbd4e7e82d1b53e7e9102e4ec7edcc8d075bcc484c4bba62e2e084",
+                    "nonce" : "0x0a29f0284a86e117",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
-                    "stateRoot" : "0xd4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25",
+                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
+                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0406a707b709a43b1185e3144a40c7dce2b2566aa9e67fa73858a899c5fb6e14a88933c0ed6a744664ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a01ca07bb68cfbd4e7e82d1b53e7e9102e4ec7edcc8d075bcc484c4bba62e2e084880a29f0284a86e117f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -427,36 +445,37 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bd7b6ab536796b5f05ac99c2b0503209aee6201ebcbadfc1da3fb7b08c52067",
-        "network" : "Homestead",
+        "lastblockhash" : "0xe8764d2e77217b490bcbf2264611e1dd04488c3a53d709efd64d73eee08e624a",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffeffffffe7ab3",
+                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b5a",
+                "balance" : "0x2320",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f58542",
+                "balance" : "0x45639182472179b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07f0",
+                "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
+                    "0x00" : "0x03e4",
+                    "0x01" : "0x01",
                     "0x02" : "0x01",
                     "0x03" : "0x01"
                 }
@@ -486,10 +505,10 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_Metropolis" : {
+    "Call1024PreCalls_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -500,19 +519,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d79b7",
-                    "hash" : "0xec551fd6f15d9172a53628c8a7cb3520c80b954793141c0938be63c0e0476e9b",
-                    "mixHash" : "0xb27e41562ad5aaee105c678b631ef15f6c7a09b90905381b0f8a80f89a99391d",
-                    "nonce" : "0xfdbb893e62b7d60a",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0xdab89d272d9d9bbe420b4471f747020df3597f392ea141047ba9ffe91d085f93",
+                    "mixHash" : "0xe03c536cbe4c4c9ce162d5cfe121b86bbc9de48f456be320d667e1cfffdcc4ae",
+                    "nonce" : "0xd25ded4ce32e60f7",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
-                    "stateRoot" : "0x0d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740b",
+                    "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
+                    "stateRoot" : "0xccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba00d72b794e6d15e093eb276b9e805b15340c7b555b1770f361ac2b572b4dc740ba05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0b27e41562ad5aaee105c678b631ef15f6c7a09b90905381b0f8a80f89a99391d88fdbb893e62b7d60af867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0e03c536cbe4c4c9ce162d5cfe121b86bbc9de48f456be320d667e1cfffdcc4ae88d25ded4ce32e60f7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -549,44 +568,155 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec551fd6f15d9172a53628c8a7cb3520c80b954793141c0938be63c0e0476e9b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdab89d272d9d9bbe420b4471f747020df3597f392ea141047ba9ffe91d085f93",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffff800000000000000f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xc563918244f3fff0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07e8",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07e8",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024PreCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x100000018542",
+                    "hash" : "0x539c8e011e74f5f0023e87cdb541e56e221839b6868a365c1f9123265e974d76",
+                    "mixHash" : "0x74f7bc0402bd02650b93b8ffb05e388aaf9477fad599983e884628e11b5c215c",
+                    "nonce" : "0x9b941d72dc7238e8",
+                    "number" : "0x01",
+                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+                    "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
+                    "stateRoot" : "0xd4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a074f7bc0402bd02650b93b8ffb05e388aaf9477fad599983e884628e11b5c215c889b941d72dc7238e8f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x539c8e011e74f5f0023e87cdb541e56e221839b6868a365c1f9123265e974d76",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
+                "balance" : "0x0fffffffffffffffffffffeffffffe7ab3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
+                "balance" : "0x1b5a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472179b7",
+                "balance" : "0x4563a18244f58542",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2a",
+                "balance" : "0x07f0",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x03e4",
-                    "0x01" : "0x01",
+                    "0x00" : "0x01",
                     "0x02" : "0x01",
                     "0x03" : "0x01"
                 }
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
index 39bee023c..563f4bfeb 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallLoseGasOOG_d0g0v0_EIP150" : {
+    "CallLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0xf98b7d7227cd6acace418d4ae64c45394101544afb2c7ab7ee8d0ea60319f5ed",
-                    "mixHash" : "0x4e53e5d5befd5f510eb20e20cbd2ed2b3646bbe972c40a862ed40960cbdefefd",
-                    "nonce" : "0x04751bbe57ec9cc0",
+                    "hash" : "0x349cd0b3d29f8187918a8e247196342f4fb54766f50616778adf2ef8645261b9",
+                    "mixHash" : "0x42e2c4a2f0b43976dfe6f34107c62dbd682a9926bba8fa1f820c7d1d0d8e18e3",
+                    "nonce" : "0x644f118ed6f6aac6",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
+                    "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
+                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a04e53e5d5befd5f510eb20e20cbd2ed2b3646bbe972c40a862ed40960cbdefefd8804751bbe57ec9cc0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a042e2c4a2f0b43976dfe6f34107c62dbd682a9926bba8fa1f820c7d1d0d8e18e388644f118ed6f6aac6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf98b7d7227cd6acace418d4ae64c45394101544afb2c7ab7ee8d0ea60319f5ed",
-        "network" : "EIP150",
+        "lastblockhash" : "0x349cd0b3d29f8187918a8e247196342f4fb54766f50616778adf2ef8645261b9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd722d",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_EIP158" : {
+    "CallLoseGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0xfe99adff99bf9b5a73c0262514c64187597f21c5ac2090944c62b5331fc0f795",
-                    "mixHash" : "0xaea46ede14ce484bd3c8ddbe6b44211bef4ecfbc24ddc720c5d79f2104d91366",
-                    "nonce" : "0xc98be43338e7173c",
+                    "hash" : "0x55016f3149d5f84873e7d4f5a3f855de644e64bb8e42b94a831386b8907fced5",
+                    "mixHash" : "0xfe4c4f35e3c78ccc6e404cbf72aa21259c0c6558811ad811b5889cdc0b6b9025",
+                    "nonce" : "0x9ec25ec42edbb29f",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
+                    "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
+                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0aea46ede14ce484bd3c8ddbe6b44211bef4ecfbc24ddc720c5d79f2104d9136688c98be43338e7173cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0fe4c4f35e3c78ccc6e404cbf72aa21259c0c6558811ad811b5889cdc0b6b9025889ec25ec42edbb29ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe99adff99bf9b5a73c0262514c64187597f21c5ac2090944c62b5331fc0f795",
-        "network" : "EIP158",
+        "lastblockhash" : "0x55016f3149d5f84873e7d4f5a3f855de644e64bb8e42b94a831386b8907fced5",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd722d",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_Frontier" : {
+    "CallLoseGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x815a890ebb8c63019d60fb93a0ad3df6193499caa223632cc4964ffde9386968",
-                    "mixHash" : "0x837b7c7c809e6e46b0c49ddf95b23ce567072dae728ff9a2e6a9b5016002d9ab",
-                    "nonce" : "0xbbcbc28ef4039e86",
+                    "gasUsed" : "0x028dc8",
+                    "hash" : "0xd1d2ec1037e0282d8384cb0b29a7605b428b0a89b6d3fc3e48bba7c2a9c4b431",
+                    "mixHash" : "0x96ab5b66adff99fedca4a0f72b865f869d40d173394a89894a366e7cc8907d3c",
+                    "nonce" : "0x55bcd0e19cba5113",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
-                    "stateRoot" : "0xe2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200c",
+                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
+                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0837b7c7c809e6e46b0c49ddf95b23ce567072dae728ff9a2e6a9b5016002d9ab88bbcbc28ef4039e86f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a096ab5b66adff99fedca4a0f72b865f869d40d173394a89894a366e7cc8907d3c8855bcd0e19cba5113f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +318,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x815a890ebb8c63019d60fb93a0ad3df6193499caa223632cc4964ffde9386968",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd1d2ec1037e0282d8384cb0b29a7605b428b0a89b6d3fc3e48bba7c2a9c4b431",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffff800000000000000f",
+                "balance" : "0xfffffffffffffffffffffffffffd722d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -322,17 +336,19 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x4563918244f68dc8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x03e9"
                 }
             }
         },
@@ -360,10 +376,10 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_Homestead" : {
+    "CallLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028972",
-                    "hash" : "0xf705868702cc3f00e1e039953ce6b7bd110992f6c7b4fbcfd1e37c67093aad89",
-                    "mixHash" : "0x7f5f105873dcc915c174caf84a1473ec85865ad2ee6ba9164f24503e603ba161",
-                    "nonce" : "0xf8b966c20055810d",
+                    "gasUsed" : "0x028dc8",
+                    "hash" : "0x3a2e88ad4fac70362c14889dc71d4813c329074c6da294ea5035581af64a52d3",
+                    "mixHash" : "0x0a269d5cc065a8ff42d7b9d2eafd24409a3df3f8ac87b57962b5db86c6edd22e",
+                    "nonce" : "0x76f0e43d13f70fcf",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
-                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
+                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a07f5f105873dcc915c174caf84a1473ec85865ad2ee6ba9164f24503e603ba16188f8b966c20055810df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a00a269d5cc065a8ff42d7b9d2eafd24409a3df3f8ac87b57962b5db86c6edd22e8876f0e43d13f70fcff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf705868702cc3f00e1e039953ce6b7bd110992f6c7b4fbcfd1e37c67093aad89",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3a2e88ad4fac70362c14889dc71d4813c329074c6da294ea5035581af64a52d3",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7683",
+                "balance" : "0xfffffffffffffffffffffffffffd722d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -441,7 +457,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68972",
+                "balance" : "0x4563918244f68dc8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -481,10 +497,10 @@
             }
         }
     },
-    "CallLoseGasOOG_d0g0v0_Metropolis" : {
+    "CallLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dc8",
-                    "hash" : "0x06fbe023d91ca0b1e5bd9172b6627b9d82429a04816c61f5a289ab5cab81c4ff",
-                    "mixHash" : "0x580ee93780b8cfb4dc5f4a3577a7138753bf12614c91b588f647dd4f3c847f74",
-                    "nonce" : "0x550f55344c23feb9",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0x69c9dad8852f20ff2a4de11240bffa04cab7e255a9e1e7d75fe1143ea0dd5bc8",
+                    "mixHash" : "0x5b7de01988386e4daa48435c87aad21620034d33eabf06f4b92e5eb1574644ee",
+                    "nonce" : "0x6ba11c01b93e5683",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
-                    "stateRoot" : "0xcd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775ba",
+                    "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
+                    "stateRoot" : "0xe2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7d7abc2738b0b4eca020dc80784afb7cc8f196d53f670428be76bb139775baa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0580ee93780b8cfb4dc5f4a3577a7138753bf12614c91b588f647dd4f3c847f7488550f55344c23feb9f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a05b7de01988386e4daa48435c87aad21620034d33eabf06f4b92e5eb1574644ee886ba11c01b93e5683f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,18 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06fbe023d91ca0b1e5bd9172b6627b9d82429a04816c61f5a289ab5cab81c4ff",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x69c9dad8852f20ff2a4de11240bffa04cab7e255a9e1e7d75fe1143ea0dd5bc8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffff800000000000000f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xc563918244f3fff0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallLoseGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x028972",
+                    "hash" : "0xf170b873f8aa5b8c87c3317e7397ee6f76bef36b7aa6e2aac4e12b50d9646b2c",
+                    "mixHash" : "0x1a0d7169a79b5d973050406ff61c2f65885fc69b4524cefaa62bab221ca5e06b",
+                    "nonce" : "0x7bfde7aaa44226c0",
+                    "number" : "0x01",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
+                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a01a0d7169a79b5d973050406ff61c2f65885fc69b4524cefaa62bab221ca5e06b887bfde7aaa44226c0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf170b873f8aa5b8c87c3317e7397ee6f76bef36b7aa6e2aac4e12b50d9646b2c",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722d",
+                "balance" : "0xfffffffffffffffffffffffffffd7683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -569,7 +697,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dc8",
+                "balance" : "0x4563918244f68972",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
index 16126e076..ea1531c84 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRecursiveBombPreCall_d0g0v0_EIP150" : {
+    "CallRecursiveBombPreCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0x1a2137eaeeee601974f579db388683f4a91808b1975c4821cf3c5436fcdc2b40",
-                    "mixHash" : "0x9b58851779a224733398e421ef66a21e550cc14a2db82dd76f859152eac975d3",
-                    "nonce" : "0xf3afbe8375c1a023",
+                    "hash" : "0xb0b1f5c7e3760866f30a48376524710e320b1004250d42389818c1004d5cf531",
+                    "mixHash" : "0x573bfb38a2d54cf4a77af7feeafe1368fc3953377e9051e9ff9067872e9247ce",
+                    "nonce" : "0x77bae860f69fd1f0",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
+                    "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
+                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a09b58851779a224733398e421ef66a21e550cc14a2db82dd76f859152eac975d388f3afbe8375c1a023f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0573bfb38a2d54cf4a77af7feeafe1368fc3953377e9051e9ff9067872e9247ce8877bae860f69fd1f0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a2137eaeeee601974f579db388683f4a91808b1975c4821cf3c5436fcdc2b40",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb0b1f5c7e3760866f30a48376524710e320b1004250d42389818c1004d5cf531",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
@@ -129,10 +136,10 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
+    "CallRecursiveBombPreCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +151,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0x9c2597d2bfc100d9d18c7a7153554fbe747686464d208251a394899ef1595cab",
-                    "mixHash" : "0xd5186ac6b47392dee63fc74eb92f7b3e6375f4bbf66d4df012c2ea5b1dd3f673",
-                    "nonce" : "0xd9a5fcaa5e69a0a5",
+                    "hash" : "0xb2d6d7bb9f1bd5f6171ab08b82d95be31c161e22b4919457f4da14f2320d54e2",
+                    "mixHash" : "0x5251c2d8cebbda923d4757f80c91c0a5eac45e240f9a94c83246fc9ae49528fb",
+                    "nonce" : "0x9faf3cbc620c4a27",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
+                    "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
+                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0d5186ac6b47392dee63fc74eb92f7b3e6375f4bbf66d4df012c2ea5b1dd3f67388d9a5fcaa5e69a0a5f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a05251c2d8cebbda923d4757f80c91c0a5eac45e240f9a94c83246fc9ae49528fb889faf3cbc620c4a27f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -192,9 +199,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c2597d2bfc100d9d18c7a7153554fbe747686464d208251a394899ef1595cab",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb2d6d7bb9f1bd5f6171ab08b82d95be31c161e22b4919457f4da14f2320d54e2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
@@ -259,10 +273,10 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
+    "CallRecursiveBombPreCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -273,19 +287,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x3faf9a9d2293d6c6f6942ddce6d198459d55db2b212ac6d5f8d46abadd7d29e1",
-                    "mixHash" : "0x1b9cfd4e92623c86cbcd73c3e0da7201c14c90469f8a5bfa1a2354f32d26239c",
-                    "nonce" : "0x9a7323dbb1209445",
+                    "gasUsed" : "0xacb1dd",
+                    "hash" : "0xbe493a5a4ff2ceafe0908d959e4dd220a61b23f5c5e72accd18276e1535a4c01",
+                    "mixHash" : "0xcd4b603b87348a44ad499afa9b350e6277eb7e9a3fbea26245f072c293599458",
+                    "nonce" : "0xd528533546a89137",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
-                    "stateRoot" : "0xbc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834d",
+                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
+                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a01b9cfd4e92623c86cbcd73c3e0da7201c14c90469f8a5bfa1a2354f32d26239c889a7323dbb1209445f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0cd4b603b87348a44ad499afa9b350e6277eb7e9a3fbea26245f072c29359945888d528533546a89137f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -322,18 +336,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3faf9a9d2293d6c6f6942ddce6d198459d55db2b212ac6d5f8d46abadd7d29e1",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbe493a5a4ff2ceafe0908d959e4dd220a61b23f5c5e72accd18276e1535a4c01",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x4563918245a0b1dd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -344,14 +360,23 @@
                 "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x03ff",
+                    "0x01" : "0x01"
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffff800000000000000f",
+                "balance" : "0x0fffffffffffffffffffffffff534e22",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -378,10 +403,10 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
+    "CallRecursiveBombPreCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -392,19 +417,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa004b5",
-                    "hash" : "0xf9a49a610d34ce2183b0d51e0c8ffaa934b1c0c7e3293b982543f199af0360cd",
-                    "mixHash" : "0xf6d414f4a975da3151e97a19742d1d50d302dc89ac4a3d12e07603f7b52edfec",
-                    "nonce" : "0x892c026b85ba616c",
+                    "gasUsed" : "0xacb1dd",
+                    "hash" : "0xdf16f036bf91f3e9e2b4e5acbcd478c48a3c906b5514e87c867555e8c2350da1",
+                    "mixHash" : "0x2edd2e368a2c2daec7acfde34f1f373348ac2ce8fcaa349e6889c2deb0893580",
+                    "nonce" : "0xc61573f0257c0fd0",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
-                    "stateRoot" : "0x133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5",
+                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
+                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0f6d414f4a975da3151e97a19742d1d50d302dc89ac4a3d12e07603f7b52edfec88892c026b85ba616cf867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a02edd2e368a2c2daec7acfde34f1f373348ac2ce8fcaa349e6889c2deb089358088c61573f0257c0fd0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -441,8 +466,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9a49a610d34ce2183b0d51e0c8ffaa934b1c0c7e3293b982543f199af0360cd",
-        "network" : "Homestead",
+        "lastblockhash" : "0xdf16f036bf91f3e9e2b4e5acbcd478c48a3c906b5514e87c867555e8c2350da1",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
@@ -454,7 +479,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182459404b5",
+                "balance" : "0x4563918245a0b1dd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -470,7 +495,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff5ffb4a",
+                "balance" : "0x0fffffffffffffffffffffffff534e22",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -508,10 +533,10 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_d0g0v0_Metropolis" : {
+    "CallRecursiveBombPreCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -522,19 +547,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xacb1dd",
-                    "hash" : "0xec1c9bf7e1d46cd1a8bdde6f289312888472d1b40286ff13f835a48d924072a4",
-                    "mixHash" : "0x0ee698edd376191a956a793f7f502296f5a225720ed3da0d98bc5fcc90468760",
-                    "nonce" : "0xd7b9359f4a6d1aa0",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0xb6fe70ab80b38e318f1996c6e853b6fb97ccc5a42aa0c914fb0c032064dc2ec1",
+                    "mixHash" : "0x650f6f9eecb3af15c605d8c91b001e90bb97cb0facc1e2688671d0bacb8f2ffd",
+                    "nonce" : "0x32c0a12b29f79ac4",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
-                    "stateRoot" : "0x0aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6d",
+                    "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
+                    "stateRoot" : "0xbc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00aab6f94f9e048424c9f0f3d638453da91a89558785715f9409294091879eb6da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a00ee698edd376191a956a793f7f502296f5a225720ed3da0d98bc5fcc9046876088d7b9359f4a6d1aa0f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0650f6f9eecb3af15c605d8c91b001e90bb97cb0facc1e2688671d0bacb8f2ffd8832c0a12b29f79ac4f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -571,16 +596,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec1c9bf7e1d46cd1a8bdde6f289312888472d1b40286ff13f835a48d924072a4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb6fe70ab80b38e318f1996c6e853b6fb97ccc5a42aa0c914fb0c032064dc2ec1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0xc563918244f3fff0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffff800000000000000f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa004b5",
+                    "hash" : "0x8cd169a1ed90e531159629bc5712de5df9b971f24fc62c8021f561a333c674c2",
+                    "mixHash" : "0x7451abb044e2993292e132e6d68b3e1a8baffc32bb9afce45f5f8cb49ba60bb7",
+                    "nonce" : "0xc151318bf48d5857",
+                    "number" : "0x01",
+                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+                    "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
+                    "stateRoot" : "0x133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a07451abb044e2993292e132e6d68b3e1a8baffc32bb9afce45f5f8cb49ba60bb788c151318bf48d5857f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
+                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8cd169a1ed90e531159629bc5712de5df9b971f24fc62c8021f561a333c674c2",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffe8",
                 "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
@@ -591,7 +728,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a0b1dd",
+                "balance" : "0x45639182459404b5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -607,7 +744,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff534e22",
+                "balance" : "0x0fffffffffffffffffffffffff5ffb4a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
index 40656d3fd..ddb7bf3d3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallcodeLoseGasOOG_d0g0v0_EIP150" : {
+    "CallcodeLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x697dc5ce9aca91aa966b22d4b7fcb9294583b5bc40eb345e61a6a5d3335a52d4",
-                    "mixHash" : "0x400a0741c7932d0256e365b952fe2133e278d5ddbc3ca4a3c0fd20f8eb1014cc",
-                    "nonce" : "0x10a19eeaef474f39",
+                    "hash" : "0xbd13a30663f5e3b48f63fa866a7fb8e6d3eafe465f80ca529a0e7e61c2ca0742",
+                    "mixHash" : "0x89c5244fc46c58c00e4d2805af9f55ba854fa12939d8dc042783fa332200b181",
+                    "nonce" : "0x40eb2021e92086a6",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
+                    "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
+                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0400a0741c7932d0256e365b952fe2133e278d5ddbc3ca4a3c0fd20f8eb1014cc8810a19eeaef474f39f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a089c5244fc46c58c00e4d2805af9f55ba854fa12939d8dc042783fa332200b1818840eb2021e92086a6f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x697dc5ce9aca91aa966b22d4b7fcb9294583b5bc40eb345e61a6a5d3335a52d4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xbd13a30663f5e3b48f63fa866a7fb8e6d3eafe465f80ca529a0e7e61c2ca0742",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
                 "code" : "",
@@ -118,10 +125,10 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
+    "CallcodeLoseGasOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +140,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x99ff74a074f246fe3dab1ee9f877f0ffdf45b1f2e2d133c3eb041a7555bdbbe8",
-                    "mixHash" : "0xcbdfa3ec1f87a875420aafc6892b9f182f2b452b02c27afa2aa480c620f610da",
-                    "nonce" : "0x15e6286c6a1fbe8e",
+                    "hash" : "0x241c9cd613f6e72f9a4faeb713e5f672dc65186a5b1561e67298787aa519824d",
+                    "mixHash" : "0x9bab71822ed99ef6b7edbd181c07cb1a9c8a756c5fce2545e451450b994fe313",
+                    "nonce" : "0x526dcc94d77d3b55",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
+                    "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
+                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0cbdfa3ec1f87a875420aafc6892b9f182f2b452b02c27afa2aa480c620f610da8815e6286c6a1fbe8ef862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a09bab71822ed99ef6b7edbd181c07cb1a9c8a756c5fce2545e451450b994fe31388526dcc94d77d3b55f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,9 +188,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99ff74a074f246fe3dab1ee9f877f0ffdf45b1f2e2d133c3eb041a7555bdbbe8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x241c9cd613f6e72f9a4faeb713e5f672dc65186a5b1561e67298787aa519824d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
                 "code" : "",
@@ -237,10 +251,10 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
+    "CallcodeLoseGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x6e0c3f6e63a996c6d734470e5dd42e78cb581b0cbdd2880e06020efeadb5b08d",
-                    "mixHash" : "0x3996fd1f9f64fb5aa86e2c2e3f438b927c5583a4994150312d8a4e1c3b3be7b7",
-                    "nonce" : "0x5a81014b16e3ff3b",
+                    "hash" : "0xedaea9fd8afef01dc9d1c958486255ea3b573270b8b499b8cc456bb1e87ff59e",
+                    "mixHash" : "0x6b51bce8c64309be95bc3a12646e5614c8169f490e1a2e08d3bc34ba4a76fc24",
+                    "nonce" : "0xb2580ddd4cb2f75d",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -263,7 +277,7 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a03996fd1f9f64fb5aa86e2c2e3f438b927c5583a4994150312d8a4e1c3b3be7b7885a81014b16e3ff3bf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a06b51bce8c64309be95bc3a12646e5614c8169f490e1a2e08d3bc34ba4a76fc2488b2580ddd4cb2f75df862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,8 +314,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e0c3f6e63a996c6d734470e5dd42e78cb581b0cbdd2880e06020efeadb5b08d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xedaea9fd8afef01dc9d1c958486255ea3b573270b8b499b8cc456bb1e87ff59e",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffffd7689",
@@ -356,10 +370,10 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
+    "CallcodeLoseGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -370,19 +384,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028972",
-                    "hash" : "0x009ff9cdd82602e41f7ffb75d74d560d563a098eceb8e21e31ffc49a3bbe9f3b",
-                    "mixHash" : "0xefb4821b81f3b6d4a9dca1ac3b69639576a31dcbe81a5c5fdf108ffd8723b437",
-                    "nonce" : "0xb65f9c5efc84602b",
+                    "gasUsed" : "0x028976",
+                    "hash" : "0x814a1f2680ee0b45a09477811b96399020e9b128727fc9a647d6752d44763f14",
+                    "mixHash" : "0x999880b2e6ee8d1db385cf17830b13dfadeac40a5a1e97c6c9f5c940bc65bbd7",
+                    "nonce" : "0x5caf7761066d67dd",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
-                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
+                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0efb4821b81f3b6d4a9dca1ac3b69639576a31dcbe81a5c5fdf108ffd8723b43788b65f9c5efc84602bf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0999880b2e6ee8d1db385cf17830b13dfadeac40a5a1e97c6c9f5c940bc65bbd7885caf7761066d67ddf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -419,11 +433,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x009ff9cdd82602e41f7ffb75d74d560d563a098eceb8e21e31ffc49a3bbe9f3b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x814a1f2680ee0b45a09477811b96399020e9b128727fc9a647d6752d44763f14",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7683",
+                "balance" : "0xfffffffffffffffffffffffffffd7689",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -437,19 +451,17 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68972",
+                "balance" : "0x4563918244f68976",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
+                "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
                 }
             }
         },
@@ -477,10 +489,10 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_d0g0v0_Metropolis" : {
+    "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -492,18 +504,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x5fc786bb0f634d2a14b04eeabeb1c66c2c0eed9a910634e8eb5c94088f479c32",
-                    "mixHash" : "0x37545377825340eb1b938f29f7443377ac344d96748f766170ce1e6bf709ecb3",
-                    "nonce" : "0x0410bc7ec3fafb9f",
+                    "hash" : "0x6d26f55656dbce0af16210c218963e8a4ddf1a2da230b73d1af48033c1e62293",
+                    "mixHash" : "0x08338d04dc8e5843e441570b2eb14898bfdb3e70bc97c04c1dcad5cc642f722a",
+                    "nonce" : "0xbad9982e02b5a156",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
-                    "stateRoot" : "0xde050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289",
+                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
+                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0de050ff56653168411e047499b4644362177f24fae2c197efa565d5a27460289a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a037545377825340eb1b938f29f7443377ac344d96748f766170ce1e6bf709ecb3880410bc7ec3fafb9ff862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a008338d04dc8e5843e441570b2eb14898bfdb3e70bc97c04c1dcad5cc642f722a88bad9982e02b5a156f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -540,18 +552,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fc786bb0f634d2a14b04eeabeb1c66c2c0eed9a910634e8eb5c94088f479c32",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6d26f55656dbce0af16210c218963e8a4ddf1a2da230b73d1af48033c1e62293",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffffd7689",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f68976",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x028972",
+                    "hash" : "0x6e5d211d6d3c6088055ec9f2344e03a46bb2dde2d2f0b2b8c5b9f48d2fb70f54",
+                    "mixHash" : "0x00ec71c7ef91963698b5fe33f55c5e702c299101aaf4f5d38e1bdc7c3d0827cb",
+                    "nonce" : "0x047ad2d9e7793cec",
+                    "number" : "0x01",
+                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+                    "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
+                    "stateRoot" : "0xf3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a000ec71c7ef91963698b5fe33f55c5e702c299101aaf4f5d38e1bdc7c3d0827cb88047ad2d9e7793cecf862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x028976",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
+                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6e5d211d6d3c6088055ec9f2344e03a46bb2dde2d2f0b2b8c5b9f48d2fb70f54",
+        "network" : "Homestead",
+        "postState" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffffd7683",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -565,17 +689,19 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
+                "balance" : "0x4563918244f68972",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x02" : "0x03e9"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
index 7bad00fea..a574b51c8 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Delegatecall1024OOG_d0g0v0_EIP150" : {
+    "Delegatecall1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xa5679d67773de7af9881fc3c2540bf8fb0898b0853093e0802cfcf59c18db997",
-                    "mixHash" : "0x2d03e47b0d1bc0e4c84eefad228b5e885c6ba093c29893f2d53b9da7b9b5f11c",
-                    "nonce" : "0x2039636e83fd9646",
+                    "hash" : "0xc206c46b16c5641ba5ec41bd8319421af8b32b9ae4c5ee47c37f7b16ed8afebd",
+                    "mixHash" : "0x338f89a1832a33db003ee806ee0920c4f735bb3b98186441b38ffe3c58a27424",
+                    "nonce" : "0x5dca50dff78639ca",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a02d03e47b0d1bc0e4c84eefad228b5e885c6ba093c29893f2d53b9da7b9b5f11c882039636e83fd9646f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0338f89a1832a33db003ee806ee0920c4f735bb3b98186441b38ffe3c58a27424885dca50dff78639caf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5679d67773de7af9881fc3c2540bf8fb0898b0853093e0802cfcf59c18db997",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc206c46b16c5641ba5ec41bd8319421af8b32b9ae4c5ee47c37f7b16ed8afebd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "Delegatecall1024OOG_d0g0v0_EIP158" : {
+    "Delegatecall1024OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,18 +143,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x1d158db0206b57bb24995041ca956ab76588465bb5073b3d17854107eeb9916f",
-                    "mixHash" : "0x8da62b09ccd21f38711b42e476969c5a119a94a38f9357c476a24ddcecdb3cb3",
-                    "nonce" : "0x690ccdca76bf2cfc",
+                    "hash" : "0x8e9851c6804d252ebd14260452882ccf64c8f3b8a21dc8f2ea3841605958af23",
+                    "mixHash" : "0x2468ae120ddc1116257e71fb989ff7af7502b9f4c4fbb44f7338ce16ad7dba6e",
+                    "nonce" : "0x53d49ff4d017625b",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
+                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
+                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a08da62b09ccd21f38711b42e476969c5a119a94a38f9357c476a24ddcecdb3cb388690ccdca76bf2cfcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a02468ae120ddc1116257e71fb989ff7af7502b9f4c4fbb44f7338ce16ad7dba6e8853d49ff4d017625bf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,9 +191,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1d158db0206b57bb24995041ca956ab76588465bb5073b3d17854107eeb9916f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8e9851c6804d252ebd14260452882ccf64c8f3b8a21dc8f2ea3841605958af23",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
@@ -243,10 +257,10 @@
             }
         }
     },
-    "Delegatecall1024OOG_d0g0v0_Frontier" : {
+    "Delegatecall1024OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +271,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe17a",
-                    "hash" : "0x87fcdd83c2ffbe9d1adc1b7b9cb66578eac021910cc9c4ff3a3c730aa35acb13",
-                    "mixHash" : "0x00eb9e5fba74012daeb5077fb109c64fd823b439e1227c5347a40e5a09bab53d",
-                    "nonce" : "0x35ebae81278d52fc",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0xf7e859c34a9e69b1e77b339def7f21549c2329c681028aa80a8291f5a83097fe",
+                    "mixHash" : "0x962607f9c6cd6cf3da1da6f1503382ba6b15a902475ba2f475d8e305f2fe0f01",
+                    "nonce" : "0x10834d21bf95e6ea",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a000eb9e5fba74012daeb5077fb109c64fd823b439e1227c5347a40e5a09bab53d8835ebae81278d52fcf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0962607f9c6cd6cf3da1da6f1503382ba6b15a902475ba2f475d8e305f2fe0f018810834d21bf95e6eaf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,11 +320,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87fcdd83c2ffbe9d1adc1b7b9cb66578eac021910cc9c4ff3a3c730aa35acb13",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf7e859c34a9e69b1e77b339def7f21549c2329c681028aa80a8291f5a83097fe",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e85",
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -324,17 +338,20 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e17a",
+                "balance" : "0x45639182452e8720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x85",
+                    "0x01" : "0x01",
+                    "0x02" : "0x020789"
                 }
             }
         },
@@ -362,10 +379,10 @@
             }
         }
     },
-    "Delegatecall1024OOG_d0g0v0_Homestead" : {
+    "Delegatecall1024OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefd576",
-                    "hash" : "0xd5874b6536f4c11682136fddab4855f0ea33742b6a95c1ed22712e0b89f7c511",
-                    "mixHash" : "0xb707218b0597a91be78d83e3ff6f24a4207eab4d08dc5a4a8e2538e7821f7b3f",
-                    "nonce" : "0xea7f3370319dbcf4",
+                    "gasUsed" : "0x3a8720",
+                    "hash" : "0x4b360be01ba025ae8a0f0a4137a884e63f580128f7c394ff4b7c98d7240cac8d",
+                    "mixHash" : "0x948a7d42017c3b957add65a5285abc16eb3c9ce4143c0ebdefb50d4ece35b14f",
+                    "nonce" : "0xef75091e2dfee64a",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
-                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
+                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0b707218b0597a91be78d83e3ff6f24a4207eab4d08dc5a4a8e2538e7821f7b3f88ea7f3370319dbcf4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0948a7d42017c3b957add65a5285abc16eb3c9ce4143c0ebdefb50d4ece35b14f88ef75091e2dfee64af862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,11 +442,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd5874b6536f4c11682136fddab4855f0ea33742b6a95c1ed22712e0b89f7c511",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4b360be01ba025ae8a0f0a4137a884e63f580128f7c394ff4b7c98d7240cac8d",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff102a7f",
+                "balance" : "0xffffffffffffffffffffffffffc578d5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,7 +460,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3d576",
+                "balance" : "0x45639182452e8720",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -454,9 +471,9 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0401",
+                    "0x00" : "0x85",
                     "0x01" : "0x01",
-                    "0x02" : "0x0fa3e9"
+                    "0x02" : "0x020789"
                 }
             }
         },
@@ -484,10 +501,10 @@
             }
         }
     },
-    "Delegatecall1024OOG_d0g0v0_Metropolis" : {
+    "Delegatecall1024OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -498,19 +515,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0x9a85f48e0a3a25fb8bb7e1bde49d55fddcc93a118f7a553770d50a10eb0b2647",
-                    "mixHash" : "0x715dc5189454d46fe36639995f5694905625bed7852e2933c4cf8653fa1c5631",
-                    "nonce" : "0xd8a8e70f4aa7f576",
+                    "gasUsed" : "0xefe17a",
+                    "hash" : "0x5a2fcd480f4034cb12575604c8705477a4471102151dd9c7d6770b34df4040b7",
+                    "mixHash" : "0xbd0e6c473297b45d093cd738ce4d269ee959e11af88dd1b0571821bb3c46c062",
+                    "nonce" : "0x093133d52bb1e685",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
-                    "stateRoot" : "0x54082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5",
+                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
+                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba054082b68585e601cedd18309da3e73e19516c577c9ba97eb7c2df0c5dd2685d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0715dc5189454d46fe36639995f5694905625bed7852e2933c4cf8653fa1c563188d8a8e70f4aa7f576f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0bd0e6c473297b45d093cd738ce4d269ee959e11af88dd1b0571821bb3c46c06288093133d52bb1e685f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -547,18 +564,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a85f48e0a3a25fb8bb7e1bde49d55fddcc93a118f7a553770d50a10eb0b2647",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5a2fcd480f4034cb12575604c8705477a4471102151dd9c7d6770b34df4040b7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff101e85",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918245e3e17a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Delegatecall1024OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xefd576",
+                    "hash" : "0x5313f5281f33c5d5490fe1fc982447b8d67abd494b92aceaa0e53d74ae86df58",
+                    "mixHash" : "0xf1b2f105724917dd60baa74a50a3fb16832fb9e2dbef5d67f9ccf5dbec45b016",
+                    "nonce" : "0x9732c050da3d0cb1",
+                    "number" : "0x01",
+                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+                    "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
+                    "stateRoot" : "0x7ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0f1b2f105724917dd60baa74a50a3fb16832fb9e2dbef5d67f9ccf5dbec45b016889732c050da3d0cb1f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xefe17a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
+                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5313f5281f33c5d5490fe1fc982447b8d67abd494b92aceaa0e53d74ae86df58",
+        "network" : "Homestead",
+        "postState" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffff102a7f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -572,7 +701,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
+                "balance" : "0x4563918245e3d576",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -583,9 +712,9 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x85",
+                    "0x00" : "0x0401",
                     "0x01" : "0x01",
-                    "0x02" : "0x020789"
+                    "0x02" : "0x0fa3e9"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
index a79a4572e..115a288e6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "Delegatecall1024_d0g0v0_EIP150" : {
+    "Delegatecall1024_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x3a2ed5c5ed53f7f5ea2fe1056ad0140c1825259dc0357497ca947f2cb6382ecf",
-                    "mixHash" : "0x8fb518659ed2097d8769bbda0fca18bf9484bbdfca3fdd3e792f8c299c521b7e",
-                    "nonce" : "0x91c0664c517b0319",
+                    "hash" : "0x0d5597ed47e13f0d06c63e331ae63705f4e479b88c39d0db6301007398312051",
+                    "mixHash" : "0x64a17b8504f326a65348d18c087ee553f524d24428a88f08e2dec901bd18768f",
+                    "nonce" : "0x2aeb20ccb8369ab2",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a08fb518659ed2097d8769bbda0fca18bf9484bbdfca3fdd3e792f8c299c521b7e8891c0664c517b0319f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a064a17b8504f326a65348d18c087ee553f524d24428a88f08e2dec901bd18768f882aeb20ccb8369ab2f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a2ed5c5ed53f7f5ea2fe1056ad0140c1825259dc0357497ca947f2cb6382ecf",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0d5597ed47e13f0d06c63e331ae63705f4e479b88c39d0db6301007398312051",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "Delegatecall1024_d0g0v0_EIP158" : {
+    "Delegatecall1024_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x798963e563e9d186adf2df13ede935a4ac00a4d504ad37b4ddbb47f660ead709",
-                    "mixHash" : "0x9b722c82384b3bf93e71c7bfe18a8e8c4d627680ddfbb8eb362363d74e365f1d",
-                    "nonce" : "0x620f0d689f7e0b30",
+                    "hash" : "0xc11f8e689944be8a9d1461d3d74327214b259ca67bcec2d5865c53641bd2a95e",
+                    "mixHash" : "0x1d8d93be29c3810a59b38d76183946fb1b2473114bd85de2cbc4ce7957726e97",
+                    "nonce" : "0x13c591e71d59ac8d",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
+                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
+                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09b722c82384b3bf93e71c7bfe18a8e8c4d627680ddfbb8eb362363d74e365f1d88620f0d689f7e0b30f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a01d8d93be29c3810a59b38d76183946fb1b2473114bd85de2cbc4ce7957726e978813c591e71d59ac8df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x798963e563e9d186adf2df13ede935a4ac00a4d504ad37b4ddbb47f660ead709",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc11f8e689944be8a9d1461d3d74327214b259ca67bcec2d5865c53641bd2a95e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "Delegatecall1024_d0g0v0_Frontier" : {
+    "Delegatecall1024_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0xffd6898c170e0f37eb770128f12186c5acb936d5aa741c85c0574aaeab5e0008",
-                    "mixHash" : "0x0c8653bd499cbbbec3dcc47bce81b94724325daa89a00fc489d342bd12d76f36",
-                    "nonce" : "0x1462ed8967201816",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0x67bba0b0ab63c0b84266021ab857d70c81af5ad518ab489ed4a69bedb854ef64",
+                    "mixHash" : "0xd5d693d3a5646da3905c37051c3ee7293bbd6b794f747983680f9df17d677c5e",
+                    "nonce" : "0x40b616161e1aa184",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
-                    "stateRoot" : "0xcf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a00c8653bd499cbbbec3dcc47bce81b94724325daa89a00fc489d342bd12d76f36881462ed8967201816f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0d5d693d3a5646da3905c37051c3ee7293bbd6b794f747983680f9df17d677c5e8840b616161e1aa184f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,11 +318,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffd6898c170e0f37eb770128f12186c5acb936d5aa741c85c0574aaeab5e0008",
-        "network" : "Frontier",
+        "lastblockhash" : "0x67bba0b0ab63c0b84266021ab857d70c81af5ad518ab489ed4a69bedb854ef64",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffff800000000000000f",
+                "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -322,17 +336,19 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
+                "balance" : "0x45639182459fc5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
+                "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
                 }
             }
         },
@@ -360,10 +376,10 @@
             }
         }
     },
-    "Delegatecall1024_d0g0v0_Homestead" : {
+    "Delegatecall1024_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000b42a",
-                    "hash" : "0xc0c726b088c9a213be7e34cb178fe6080ea6e0a89dc69ac4b6938954d0178401",
-                    "mixHash" : "0x385359204ac6f6343a0515060dfa41eeaac8c87f3fa267caabbe7c5afbdedcb4",
-                    "nonce" : "0x04a96222c1910ff6",
+                    "gasUsed" : "0xabc5ed",
+                    "hash" : "0xef3396269f33539a1be4104f9ece0e6ec0cc680aa222cbfdcf24c5f767f399f6",
+                    "mixHash" : "0x9a845b19ed0c4a93277432ffb2913d9270a925c43c093118223420a2b5b2ddcf",
+                    "nonce" : "0x0923e58392112526",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
-                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
+                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0385359204ac6f6343a0515060dfa41eeaac8c87f3fa267caabbe7c5afbdedcb48804a96222c1910ff6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09a845b19ed0c4a93277432ffb2913d9270a925c43c093118223420a2b5b2ddcf880923e58392112526f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,11 +439,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0c726b088c9a213be7e34cb178fe6080ea6e0a89dc69ac4b6938954d0178401",
-        "network" : "Homestead",
+        "lastblockhash" : "0xef3396269f33539a1be4104f9ece0e6ec0cc680aa222cbfdcf24c5f767f399f6",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff4bcb",
+                "balance" : "0xffffffffffffffffffffffffff543a08",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -441,7 +457,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4b42a",
+                "balance" : "0x45639182459fc5ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -452,7 +468,8 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01"
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
                 }
             }
         },
@@ -480,10 +497,10 @@
             }
         }
     },
-    "Delegatecall1024_d0g0v0_Metropolis" : {
+    "Delegatecall1024_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -494,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x3e674c36e51a3bcea74df6d3ecae8f2ae9e60480762c81663048dd95d4b67fdc",
-                    "mixHash" : "0x072cb106e4672b73f39be18a8c2a69513682a49116817247f3f0c22df159387b",
-                    "nonce" : "0xcc683a79c9665f06",
+                    "gasUsed" : "0x7ffffffffffffff0",
+                    "hash" : "0xb0d3fd654d9a0189cbd623a58acb82047b6127b132abe6d26e480ff0dd0a2f07",
+                    "mixHash" : "0xb5df99f7b478ff1eced9745d469a9b631d45fd32dececb9eec4bc51fc398738c",
+                    "nonce" : "0x9440f95a3aeb8585",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
-                    "stateRoot" : "0x39526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315d",
+                    "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
+                    "stateRoot" : "0xcf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba039526f5574bd97ef6d582ff02184c5caa8598e86d5289b0533acc09e7dd1315da05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0072cb106e4672b73f39be18a8c2a69513682a49116817247f3f0c22df159387b88cc683a79c9665f06f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0b5df99f7b478ff1eced9745d469a9b631d45fd32dececb9eec4bc51fc398738c889440f95a3aeb8585f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -543,18 +560,130 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e674c36e51a3bcea74df6d3ecae8f2ae9e60480762c81663048dd95d4b67fdc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb0d3fd654d9a0189cbd623a58acb82047b6127b132abe6d26e480ff0dd0a2f07",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffff800000000000000f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xc563918244f3fff0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Delegatecall1024_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x10000000b42a",
+                    "hash" : "0x0b62350b620ab99e86d33d5772d9f68cd9c7a39477ad045c9945f0d389cd0636",
+                    "mixHash" : "0x21ffa093f4a1ca25a687f346f839c3e8da94fbfa119f8a0c3b054d136606578a",
+                    "nonce" : "0x2299128adef4692c",
+                    "number" : "0x01",
+                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+                    "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
+                    "stateRoot" : "0x8dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a021ffa093f4a1ca25a687f346f839c3e8da94fbfa119f8a0c3b054d136606578a882299128adef4692cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0b62350b620ab99e86d33d5772d9f68cd9c7a39477ad045c9945f0d389cd0636",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
+                "balance" : "0xffffffffffffffffffffefffffff4bcb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -568,7 +697,7 @@
                 }
             },
             "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
+                "balance" : "0x4563a18244f4b42a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -579,8 +708,7 @@
                 "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
+                    "0x00" : "0x01"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
index 5413a901f..c91f78171 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput1_d0g0v0_EIP150" : {
+    "callOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9750b492f360d12e972160fc6e5d63174b30be340ef5b43b7f5e59b9ed7dd2b3",
-                    "mixHash" : "0x35f2cc12a676e98848be6524eb2c8ebde4ecbc795d075dbd99b0b3dce2b9a9c3",
-                    "nonce" : "0xcd444ed07b5f4be4",
+                    "hash" : "0x38825d99ac44f994fd4d84217816d2efcd39b624ff5ccc11f9cead7d6d340d7d",
+                    "mixHash" : "0x53c8710e13d8e13253805e15e2d85a218c5579313d2a5d48220bea098b898be4",
+                    "nonce" : "0x2e3d59edd2d43e9e",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035f2cc12a676e98848be6524eb2c8ebde4ecbc795d075dbd99b0b3dce2b9a9c388cd444ed07b5f4be4c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a053c8710e13d8e13253805e15e2d85a218c5579313d2a5d48220bea098b898be4882e3d59edd2d43e9ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9750b492f360d12e972160fc6e5d63174b30be340ef5b43b7f5e59b9ed7dd2b3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x38825d99ac44f994fd4d84217816d2efcd39b624ff5ccc11f9cead7d6d340d7d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput1_d0g0v0_EIP158" : {
+    "callOutput1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x99d163dfb2ac725bd6c809b944b63e5576691ce67e29d6e81c6c37f15b1aa95c",
-                    "mixHash" : "0x2fbc0c824c05256969de45d341c4868f7d617a128957f9e086ac8454d008d289",
-                    "nonce" : "0x26c55935e78209ab",
+                    "hash" : "0x5de81344a06e4f29584810756d85f6802aed62780a39c43ac51f09656ec2b46e",
+                    "mixHash" : "0x67cd7466a871675fee06182f7b6dec1fe5e55af128fb6afdb29713e892e53fb9",
+                    "nonce" : "0x3d9163ebfd704a46",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02fbc0c824c05256969de45d341c4868f7d617a128957f9e086ac8454d008d2898826c55935e78209abc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a067cd7466a871675fee06182f7b6dec1fe5e55af128fb6afdb29713e892e53fb9883d9163ebfd704a46c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99d163dfb2ac725bd6c809b944b63e5576691ce67e29d6e81c6c37f15b1aa95c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5de81344a06e4f29584810756d85f6802aed62780a39c43ac51f09656ec2b46e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput1_d0g0v0_Frontier" : {
+    "callOutput1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x19b96f63eeb4c2a0a7d6f07a954c0da4b5dfc81e7c18186753d0a1ae52b1e9d0",
-                    "mixHash" : "0x4beb998f9b334addd8942d1f5bd5a91d3c7cc2d76ae01273532966066972e3fc",
-                    "nonce" : "0x7b8cd413fdc8ef2a",
+                    "hash" : "0x081d2c6a3bd56e19bc139623477de773cd4b4197775d611ce77ba9eafb7b8dac",
+                    "mixHash" : "0x8a621a5241c3864777e54fb97384465358569b8555867035a83ded6df4480adc",
+                    "nonce" : "0x84f23cff8c765585",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04beb998f9b334addd8942d1f5bd5a91d3c7cc2d76ae01273532966066972e3fc887b8cd413fdc8ef2ac0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08a621a5241c3864777e54fb97384465358569b8555867035a83ded6df4480adc8884f23cff8c765585c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x19b96f63eeb4c2a0a7d6f07a954c0da4b5dfc81e7c18186753d0a1ae52b1e9d0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x081d2c6a3bd56e19bc139623477de773cd4b4197775d611ce77ba9eafb7b8dac",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput1_d0g0v0_Homestead" : {
+    "callOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd66a90bfcf25704b70f709e9be15996337697d53b33b895d5464e13028e1843c",
-                    "mixHash" : "0xa3947200dd1e741415d6db86380d8f68f12a596366ec1ef5cc0c289481815b74",
-                    "nonce" : "0x4470be7ceefc7739",
+                    "hash" : "0x89dce96269e89e6ea2e69952633db17d818c6f3c5d469544e4979acb3cd79e4b",
+                    "mixHash" : "0x920e52884602d60f8ef1d9a74e3b93d299ccfd7fabba37217cf9b32671be7df8",
+                    "nonce" : "0xe0b052e30412cd26",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3947200dd1e741415d6db86380d8f68f12a596366ec1ef5cc0c289481815b74884470be7ceefc7739c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0920e52884602d60f8ef1d9a74e3b93d299ccfd7fabba37217cf9b32671be7df888e0b052e30412cd26c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd66a90bfcf25704b70f709e9be15996337697d53b33b895d5464e13028e1843c",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89dce96269e89e6ea2e69952633db17d818c6f3c5d469544e4979acb3cd79e4b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput1_d0g0v0_Metropolis" : {
+    "callOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2f9153894ce615a2c9373b9f523559ec7c6d6e3036733523cf99f12a0c1ffb66",
-                    "mixHash" : "0x7b5d10d2a5a4c89b4f55a92d688177148408651eb5d2c41079cb81fbfc36836b",
-                    "nonce" : "0xfb386255fa6e1850",
+                    "hash" : "0x8ed742d9277f914e065c241f20e2659e112e3f1811be5c88beee0cf1d4806deb",
+                    "mixHash" : "0xc55a69566fbcb1a68f0215a15fc1eb12b724b42e68ca24c9cbacbcfb7d4aff70",
+                    "nonce" : "0x75ea5f3fb33939ee",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07b5d10d2a5a4c89b4f55a92d688177148408651eb5d2c41079cb81fbfc36836b88fb386255fa6e1850c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c55a69566fbcb1a68f0215a15fc1eb12b724b42e68ca24c9cbacbcfb7d4aff708875ea5f3fb33939eec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f9153894ce615a2c9373b9f523559ec7c6d6e3036733523cf99f12a0c1ffb66",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8ed742d9277f914e065c241f20e2659e112e3f1811be5c88beee0cf1d4806deb",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xec8252cbb972ed163b310c2a57be6d47bb03872403c6d2e872d4b9d7c12719fd",
+                    "mixHash" : "0xaf1b14ba348ddb159058e2a5d8fe13d9ccf8d2383cf2b1bee383b51e55249c78",
+                    "nonce" : "0xa0a7889eb67dde3c",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0af1b14ba348ddb159058e2a5d8fe13d9ccf8d2383cf2b1bee383b51e55249c7888a0a7889eb67dde3cc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xec8252cbb972ed163b310c2a57be6d47bb03872403c6d2e872d4b9d7c12719fd",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
index 9e035139f..17deb6ca7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput1_d0g1v0_EIP150" : {
+    "callOutput1_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xf0991797b487884121acbe150e9b7863d9ad3ff6d4a3d47f81984aac5f277f28",
-                    "mixHash" : "0xd2f454f66d218f3886a735e8fe287fa07a84b4373f15766944f1658417747f87",
-                    "nonce" : "0x273524d38e60a870",
+                    "hash" : "0xf097186db787fd2f66e876fe30de8a8566822a67f2976d375b6eca07dde0087f",
+                    "mixHash" : "0x1ee308ed2ecbe8228b9d2e5afcba65a791ef9b872d589cdfc5e28757dfed9f21",
+                    "nonce" : "0xa42949ecc77a55a4",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
-                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0d2f454f66d218f3886a735e8fe287fa07a84b4373f15766944f1658417747f8788273524d38e60a870f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a01ee308ed2ecbe8228b9d2e5afcba65a791ef9b872d589cdfc5e28757dfed9f2188a42949ecc77a55a4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0991797b487884121acbe150e9b7863d9ad3ff6d4a3d47f81984aac5f277f28",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf097186db787fd2f66e876fe30de8a8566822a67f2976d375b6eca07dde0087f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput1_d0g1v0_EIP158" : {
+    "callOutput1_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x987179198a15eaa2b39ed6da7262951533a3a86ec60a030974b4802b9facdd9b",
-                    "mixHash" : "0xfadd42ba211e6ba51a6675c25bd4348d2298ab4811106383819469217e22d7d4",
-                    "nonce" : "0x983a296fb5017a4c",
+                    "hash" : "0x2fe6610b9bfe97d5b159b078c9b1b66bac77e51e74e9e96a14f59db60ae77071",
+                    "mixHash" : "0xb14d18b1667b0d320c1cff43c5a5f1620dc24da1b5b0c74a66d5747668e2984b",
+                    "nonce" : "0xcd82d8ae56bb045f",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
-                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0fadd42ba211e6ba51a6675c25bd4348d2298ab4811106383819469217e22d7d488983a296fb5017a4cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b14d18b1667b0d320c1cff43c5a5f1620dc24da1b5b0c74a66d5747668e2984b88cd82d8ae56bb045ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x987179198a15eaa2b39ed6da7262951533a3a86ec60a030974b4802b9facdd9b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2fe6610b9bfe97d5b159b078c9b1b66bac77e51e74e9e96a14f59db60ae77071",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput1_d0g1v0_Frontier" : {
+    "callOutput1_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0xd9fc219b5aa61bebfeb97336dbbc384461836573a180419868a173f5f28a7b28",
-                    "mixHash" : "0x503ae887ab836940d7beb9340a06fa9287694e1c8d7a909f3827f8d032373be2",
-                    "nonce" : "0x214ea3d7dc76834d",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x718f783ea384d03aacde66f5d47e9e0abaa551fe8c10fabd6ca0f45bd9784342",
+                    "mixHash" : "0x853db1b80857f015d8e4b08f2d0aa8b488e6dab9664399793ec1c3cac7926ac2",
+                    "nonce" : "0x5b828cda7600cebb",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
-                    "stateRoot" : "0x224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2",
+                    "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
+                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0503ae887ab836940d7beb9340a06fa9287694e1c8d7a909f3827f8d032373be288214ea3d7dc76834df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0853db1b80857f015d8e4b08f2d0aa8b488e6dab9664399793ec1c3cac7926ac2885b828cda7600cebbf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9fc219b5aa61bebfeb97336dbbc384461836573a180419868a173f5f28a7b28",
-        "network" : "Frontier",
+        "lastblockhash" : "0x718f783ea384d03aacde66f5d47e9e0abaa551fe8c10fabd6ca0f45bd9784342",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput1_d0g1v0_Homestead" : {
+    "callOutput1_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "0xf20c5d0f7082200bc8e04eb88700b51d19c6c9715c06015ac5efe8d041f82da9",
-                    "mixHash" : "0xcdd82ddb8f7168ba77391758cc78e93190d513b440f5cc4a3007bd81e30e58fe",
-                    "nonce" : "0x3a2d03a7a379aad6",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x586982b9457b2780d50f2aaddbe1c9f8cfbeb03fed78f604d4e5b29503863aeb",
+                    "mixHash" : "0xe021ff3f2b40c54191c8aa432f7709f5cecded3bc0591ff1a226926502a0aaa1",
+                    "nonce" : "0x883a9243aec6df85",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
+                    "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
                     "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0cdd82ddb8f7168ba77391758cc78e93190d513b440f5cc4a3007bd81e30e58fe883a2d03a7a379aad6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e021ff3f2b40c54191c8aa432f7709f5cecded3bc0591ff1a226926502a0aaa188883a9243aec6df85f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf20c5d0f7082200bc8e04eb88700b51d19c6c9715c06015ac5efe8d041f82da9",
-        "network" : "Homestead",
+        "lastblockhash" : "0x586982b9457b2780d50f2aaddbe1c9f8cfbeb03fed78f604d4e5b29503863aeb",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput1_d0g1v0_Metropolis" : {
+    "callOutput1_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x2ef4a5b77e653a87518c41a961379408635a0170b4679ac47787b30672bd197c",
-                    "mixHash" : "0x8bca25e069fed4ca9ac3f3a7a20b9cecf7437a5b02f9105569e36bdf72620a08",
-                    "nonce" : "0xfb1456e012593f97",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x45d50010fd70f6214d90eb0654f09161ff341f911e8ed72424e96eb97311eaea",
+                    "mixHash" : "0x8cb08dbacf9f27f5410b4a4eb5310694ad68b7f304cac503df91a4e98544ff98",
+                    "nonce" : "0x495a4aa46e1bd93b",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xaf2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22",
+                    "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
+                    "stateRoot" : "0x224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af2ab7cdd723b11dc0c3667dff180d45c30afaead8f2b923ee19a5494c5f0c22a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a08bca25e069fed4ca9ac3f3a7a20b9cecf7437a5b02f9105569e36bdf72620a0888fb1456e012593f97f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a08cb08dbacf9f27f5410b4a4eb5310694ad68b7f304cac503df91a4e98544ff9888495a4aa46e1bd93bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ef4a5b77e653a87518c41a961379408635a0170b4679ac47787b30672bd197c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x45d50010fd70f6214d90eb0654f09161ff341f911e8ed72424e96eb97311eaea",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput1_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x0f86859775c056c58a710ae4b092da8ca223ee2eb45477ed983b596a2d1013f1",
+                    "mixHash" : "0x63f3d1e1854b18285450a27bef75712396d28bd3d911e9a4285b9f96da97fb92",
+                    "nonce" : "0xd53aad9930e25dc4",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
+                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a063f3d1e1854b18285450a27bef75712396d28bd3d911e9a4285b9f96da97fb9288d53aad9930e25dc4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0f86859775c056c58a710ae4b092da8ca223ee2eb45477ed983b596a2d1013f1",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
index 041f1a420..7e857e893 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput2_d0g0v0_EIP150" : {
+    "callOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xec9c10e8c6c3ef5143f3347bf57d77d2b364a4546f89ae41f8ca5b4cfb3a50cb",
-                    "mixHash" : "0x47b6bb1fdd812d7b9da72e0790b1ac9d91dfd09812db34d43079b6ae5ec42c03",
-                    "nonce" : "0xa964e975d1623600",
+                    "hash" : "0xabbba1788af1c293d764fb06abcc8fa9ecdbad7132cd9b3467b6dc08dca8826b",
+                    "mixHash" : "0x45e075c142a831e31ab340b2ec1efb72f791953f1210341787a8cf61c506e41f",
+                    "nonce" : "0x732949412e109733",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047b6bb1fdd812d7b9da72e0790b1ac9d91dfd09812db34d43079b6ae5ec42c0388a964e975d1623600c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a045e075c142a831e31ab340b2ec1efb72f791953f1210341787a8cf61c506e41f88732949412e109733c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec9c10e8c6c3ef5143f3347bf57d77d2b364a4546f89ae41f8ca5b4cfb3a50cb",
-        "network" : "EIP150",
+        "lastblockhash" : "0xabbba1788af1c293d764fb06abcc8fa9ecdbad7132cd9b3467b6dc08dca8826b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput2_d0g0v0_EIP158" : {
+    "callOutput2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8147fb075c0f47be4900082858b8b1db35dbdb159559c182529fd6ef83ee9819",
-                    "mixHash" : "0x5767918a01c83997064a44e2171e76e21e7bccf795994286ecdeeebd7488c503",
-                    "nonce" : "0xcd0b976b3dac4bdc",
+                    "hash" : "0x539a07da41059d2a3dbd6d5b9a3d30d0664eb671a62caaf7e14bc4e4f7588965",
+                    "mixHash" : "0xecd2bbf672a718ecfe3dbbac8150d9f5a0fc2e2dd62980e017c09e52b68362e1",
+                    "nonce" : "0xbf88ea60daae74e7",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05767918a01c83997064a44e2171e76e21e7bccf795994286ecdeeebd7488c50388cd0b976b3dac4bdcc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecd2bbf672a718ecfe3dbbac8150d9f5a0fc2e2dd62980e017c09e52b68362e188bf88ea60daae74e7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8147fb075c0f47be4900082858b8b1db35dbdb159559c182529fd6ef83ee9819",
-        "network" : "EIP158",
+        "lastblockhash" : "0x539a07da41059d2a3dbd6d5b9a3d30d0664eb671a62caaf7e14bc4e4f7588965",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput2_d0g0v0_Frontier" : {
+    "callOutput2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd61fb684ed00558694e145513937b3bc475572da6cfc322a72dc4788e69b9e06",
-                    "mixHash" : "0x3fbb5e36ffb8aa4b714b6270fcbc9e1bf2ffbdaf2bae431fe690031641e3c4a8",
-                    "nonce" : "0xfe72511ba0aebbb3",
+                    "hash" : "0x3f7a3192b736a50dab427a516cb9eae99c122729a2f06161e23de8b882676e06",
+                    "mixHash" : "0x9aa8dd22738c6d1c84f25cd02b6d01eb9a57267ac34f7f80d4ab86b87cbb33a1",
+                    "nonce" : "0x93cf93ae32a1b753",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03fbb5e36ffb8aa4b714b6270fcbc9e1bf2ffbdaf2bae431fe690031641e3c4a888fe72511ba0aebbb3c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09aa8dd22738c6d1c84f25cd02b6d01eb9a57267ac34f7f80d4ab86b87cbb33a18893cf93ae32a1b753c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd61fb684ed00558694e145513937b3bc475572da6cfc322a72dc4788e69b9e06",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3f7a3192b736a50dab427a516cb9eae99c122729a2f06161e23de8b882676e06",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput2_d0g0v0_Homestead" : {
+    "callOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xbb90feb8d8a65d3fdcf9796af6357f1c29b93c485a00013a68149531abef3c55",
-                    "mixHash" : "0x7d79329970eba3b58d8b5e8c0bd72b992814d00ebbfe52568f3e4723dbabd601",
-                    "nonce" : "0x52bdc30b2affd11d",
+                    "hash" : "0xb66927c07b200a6c49ef50068d96676ab7a336da6e10a082f3d6536f82578c0b",
+                    "mixHash" : "0x3b38e3266ad0f194e9f2e0a4e796fb27d7073cd2e818fcecf5f8c4c169920761",
+                    "nonce" : "0x910da296b4f04bf5",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07d79329970eba3b58d8b5e8c0bd72b992814d00ebbfe52568f3e4723dbabd6018852bdc30b2affd11dc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03b38e3266ad0f194e9f2e0a4e796fb27d7073cd2e818fcecf5f8c4c16992076188910da296b4f04bf5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb90feb8d8a65d3fdcf9796af6357f1c29b93c485a00013a68149531abef3c55",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb66927c07b200a6c49ef50068d96676ab7a336da6e10a082f3d6536f82578c0b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput2_d0g0v0_Metropolis" : {
+    "callOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x31a8fc62d3c71bb35cf71b685f3a3c4272f0fb32d2d7fbb1b1a95011b0e64f6c",
-                    "mixHash" : "0x898a53c743d7b2502f2c97461687613bd7617c4ea90c2f7e8eae3f8172102602",
-                    "nonce" : "0xaba9ad750f2bb3e1",
+                    "hash" : "0x4b014c01d112b5699ca0e2d37d318871bbe32e2ff002c1dd9ac538b4d4b1df1a",
+                    "mixHash" : "0xd8a538579fc65154e61f91e47286acefbd610ff5d81bd43b11c32e55eade7cde",
+                    "nonce" : "0xe3b664d2b7ef700c",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0898a53c743d7b2502f2c97461687613bd7617c4ea90c2f7e8eae3f817210260288aba9ad750f2bb3e1c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d8a538579fc65154e61f91e47286acefbd610ff5d81bd43b11c32e55eade7cde88e3b664d2b7ef700cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31a8fc62d3c71bb35cf71b685f3a3c4272f0fb32d2d7fbb1b1a95011b0e64f6c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4b014c01d112b5699ca0e2d37d318871bbe32e2ff002c1dd9ac538b4d4b1df1a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x93f13ab42f56fb965f71a1f11b4f2d915fbd2de68fba420eb0fd3e34331a7256",
+                    "mixHash" : "0x569e8c7e7d5bb4cd1725a7e401ebb424bb4e5e7cb5fb52502282f8dfdb95fe2b",
+                    "nonce" : "0x89f3861974d11926",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0569e8c7e7d5bb4cd1725a7e401ebb424bb4e5e7cb5fb52502282f8dfdb95fe2b8889f3861974d11926c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93f13ab42f56fb965f71a1f11b4f2d915fbd2de68fba420eb0fd3e34331a7256",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
index 7a624c36b..dc357b5e0 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput2_d0g1v0_EIP150" : {
+    "callOutput2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x4ac877a0ccadaecc439f8cb55b9a1cc58d5bd1d85965fbbceca491f93d78e328",
-                    "mixHash" : "0xcf9b8d20da3180f73f974e748125b88ccca7c41fd797c1ebb051cefaf8ddd55e",
-                    "nonce" : "0x19f3addb218aa64f",
+                    "hash" : "0x22acbad3344d473396c6026f9630038c2239bc4332e1638494956c574e6b4c2f",
+                    "mixHash" : "0x9e9e157ee71cb8bb3b75d87f497f34cc993f125eb652d88bcfad8c9d7c96e503",
+                    "nonce" : "0xeb93c85af190929b",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
-                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0cf9b8d20da3180f73f974e748125b88ccca7c41fd797c1ebb051cefaf8ddd55e8819f3addb218aa64ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a09e9e157ee71cb8bb3b75d87f497f34cc993f125eb652d88bcfad8c9d7c96e50388eb93c85af190929bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ac877a0ccadaecc439f8cb55b9a1cc58d5bd1d85965fbbceca491f93d78e328",
-        "network" : "EIP150",
+        "lastblockhash" : "0x22acbad3344d473396c6026f9630038c2239bc4332e1638494956c574e6b4c2f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput2_d0g1v0_EIP158" : {
+    "callOutput2_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xe343317ad0559166a5dee16ff55d5dea419970566e59e1f9631fb70b76d58bca",
-                    "mixHash" : "0x0a10b851008d26ddc94b82b869f64e091dd634c98907fd81ee5794510ac19506",
-                    "nonce" : "0xdc8acb825caa8775",
+                    "hash" : "0x031dc91b52b7ee036e4a3be9611fe437deaccfa29629c87f57c87b585a313972",
+                    "mixHash" : "0x672691f1d9cba02867912bd52d9e0b6d55cb1319b09cecf66b4011d182d8c056",
+                    "nonce" : "0x1e6ac53c3b109728",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
-                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a00a10b851008d26ddc94b82b869f64e091dd634c98907fd81ee5794510ac1950688dc8acb825caa8775f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0672691f1d9cba02867912bd52d9e0b6d55cb1319b09cecf66b4011d182d8c056881e6ac53c3b109728f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe343317ad0559166a5dee16ff55d5dea419970566e59e1f9631fb70b76d58bca",
-        "network" : "EIP158",
+        "lastblockhash" : "0x031dc91b52b7ee036e4a3be9611fe437deaccfa29629c87f57c87b585a313972",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput2_d0g1v0_Frontier" : {
+    "callOutput2_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x214366d6f292a1e53e72b1f966591d922e52543b6685004a62f1b479fd2d5ac3",
-                    "mixHash" : "0x93361f3f4d87a96d42b2c3c5e865f2cda3f389fe50cf5972078c8d7ef971b680",
-                    "nonce" : "0xf62159098fc6bf5f",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x90966334904025cf7fd0b97bc5dabfd9e776b080803dcf73c03da556ae91c9fa",
+                    "mixHash" : "0x3d29edc02be6a5296561f6ab7e1e2060650c4250f6d2c02472854766b3f39a3d",
+                    "nonce" : "0xd8f7ccfb4e0b712a",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
-                    "stateRoot" : "0x883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18cee",
+                    "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
+                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a093361f3f4d87a96d42b2c3c5e865f2cda3f389fe50cf5972078c8d7ef971b68088f62159098fc6bf5ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03d29edc02be6a5296561f6ab7e1e2060650c4250f6d2c02472854766b3f39a3d88d8f7ccfb4e0b712af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x214366d6f292a1e53e72b1f966591d922e52543b6685004a62f1b479fd2d5ac3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x90966334904025cf7fd0b97bc5dabfd9e776b080803dcf73c03da556ae91c9fa",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput2_d0g1v0_Homestead" : {
+    "callOutput2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "0x860e6a7259729dbf7504c846ce94034ba97f24187f251bd6f9dff4379918611f",
-                    "mixHash" : "0x8f4f448089ddc08ca2f170974fadbaf6fb0ecd102bdbe96c409303357d140bda",
-                    "nonce" : "0x217fb12235d7baa7",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x2a033eb9b1493ba77a61f4a56d45319278c32a78cefa96ed8c9f5e7c95e4f96d",
+                    "mixHash" : "0x73f45d584f998e93d0b36ec5b1d86fd0b8d63fde2c755e9bcd5114a09f8c2283",
+                    "nonce" : "0xe003f2777bf60cf1",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
+                    "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
                     "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a08f4f448089ddc08ca2f170974fadbaf6fb0ecd102bdbe96c409303357d140bda88217fb12235d7baa7f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a073f45d584f998e93d0b36ec5b1d86fd0b8d63fde2c755e9bcd5114a09f8c228388e003f2777bf60cf1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x860e6a7259729dbf7504c846ce94034ba97f24187f251bd6f9dff4379918611f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2a033eb9b1493ba77a61f4a56d45319278c32a78cefa96ed8c9f5e7c95e4f96d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput2_d0g1v0_Metropolis" : {
+    "callOutput2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x34300515593a0d36fd751068112429357dd38c586eeaefb4fec96758b429e0e1",
-                    "mixHash" : "0xd4e6d44fe07e4b713eefb542f113e675025b281696c0dbea45e7e7751a7b0973",
-                    "nonce" : "0xab971ead2738c9ec",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x807aa9b9194ac3d30b63a6739ac813b4cf59f4f244c6887db633eaafdd8e61d1",
+                    "mixHash" : "0xf1788c83f623642255e24781fbd24a8763850efe4e6c639697a9f7d643436911",
+                    "nonce" : "0x1eb6e230dbda6180",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xc1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880",
+                    "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
+                    "stateRoot" : "0x883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18cee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1210b77340d0377a16c655b62aa8463eb56f1133e697f5cd77cc59b20a3f880a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0d4e6d44fe07e4b713eefb542f113e675025b281696c0dbea45e7e7751a7b097388ab971ead2738c9ecf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0f1788c83f623642255e24781fbd24a8763850efe4e6c639697a9f7d643436911881eb6e230dbda6180f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34300515593a0d36fd751068112429357dd38c586eeaefb4fec96758b429e0e1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x807aa9b9194ac3d30b63a6739ac813b4cf59f4f244c6887db633eaafdd8e61d1",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput2_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x264b2b9fdb1a784492ef441f8ced8c7b8c9a68b4d0c63c58aef58a5d2f3956a8",
+                    "mixHash" : "0x5c0e8b1cda4681cc612456355c74ad854b05f89b7f22d71b26221ea978cf7809",
+                    "nonce" : "0x37db760412141b02",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
+                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a05c0e8b1cda4681cc612456355c74ad854b05f89b7f22d71b26221ea978cf78098837db760412141b02f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x264b2b9fdb1a784492ef441f8ced8c7b8c9a68b4d0c63c58aef58a5d2f3956a8",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
index a471d4c0f..5d3eb6570 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3Fail_d0g0v0_EIP150" : {
+    "callOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xda81072b40c38ae26e3b5861f83b75c36c1e24254b9ee1780aa963ab771c06ec",
-                    "mixHash" : "0x3883d9f00507d9cb290f87ab82169d5c47b8bc602b757ce027d767c01a74655f",
-                    "nonce" : "0x07256691ad3889ea",
+                    "hash" : "0x5798a6dc2e279980d0ad065540377555671c17ea053e664a00bf3ef5a6b1ca28",
+                    "mixHash" : "0x3b4538969b7e847ff7a461643c9cdf501a27ed63c4957d9224c1795f299661ef",
+                    "nonce" : "0xd52530526fde1f0e",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03883d9f00507d9cb290f87ab82169d5c47b8bc602b757ce027d767c01a74655f8807256691ad3889eac0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03b4538969b7e847ff7a461643c9cdf501a27ed63c4957d9224c1795f299661ef88d52530526fde1f0ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda81072b40c38ae26e3b5861f83b75c36c1e24254b9ee1780aa963ab771c06ec",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5798a6dc2e279980d0ad065540377555671c17ea053e664a00bf3ef5a6b1ca28",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_EIP158" : {
+    "callOutput3Fail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf2e9fd310da15de1b1ffcd233030b33b6865b95ac51a55edb5fc67264d25fb64",
-                    "mixHash" : "0x6d77c7ec9fb2b9066a74fae211b0864fbc006bef66e8bae9242b1d1da1416f06",
-                    "nonce" : "0x02b58f85c998bdaa",
+                    "hash" : "0xd927475b458a6337e0d96a1fab86aeaa69c5067a2faa37acb0c7f821cc5514cb",
+                    "mixHash" : "0xef12a8e9e882740783295b0918a2278c3024e0f189981e792354e45e3c162bea",
+                    "nonce" : "0xce8c4a8fbcebf532",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06d77c7ec9fb2b9066a74fae211b0864fbc006bef66e8bae9242b1d1da1416f068802b58f85c998bdaac0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ef12a8e9e882740783295b0918a2278c3024e0f189981e792354e45e3c162bea88ce8c4a8fbcebf532c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2e9fd310da15de1b1ffcd233030b33b6865b95ac51a55edb5fc67264d25fb64",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd927475b458a6337e0d96a1fab86aeaa69c5067a2faa37acb0c7f821cc5514cb",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_Frontier" : {
+    "callOutput3Fail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2aa6560dd76e992a78a15d1e69db1b7c0b29af17cfad385951617d309bf45da0",
-                    "mixHash" : "0x3f6bc1903bff8010f1d314b790b0ab4d838009287662ff9ea7ccd0ca4ef1171e",
-                    "nonce" : "0x4a09272ea3c514a8",
+                    "hash" : "0x6443af23e7b7b12e2c85b276a5f68941fb1fe8896c2e04776010978a6b624c09",
+                    "mixHash" : "0x7a4e8872bb7389e65d15e3a285dd212c8f3c20e27cb26e9c4478c21555734416",
+                    "nonce" : "0xe52b37c5ec0daf93",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03f6bc1903bff8010f1d314b790b0ab4d838009287662ff9ea7ccd0ca4ef1171e884a09272ea3c514a8c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07a4e8872bb7389e65d15e3a285dd212c8f3c20e27cb26e9c4478c2155573441688e52b37c5ec0daf93c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2aa6560dd76e992a78a15d1e69db1b7c0b29af17cfad385951617d309bf45da0",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6443af23e7b7b12e2c85b276a5f68941fb1fe8896c2e04776010978a6b624c09",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_Homestead" : {
+    "callOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x41e91af2cccfa9840193a723e81467414bcf4f72a17290ac00d92256e49826a0",
-                    "mixHash" : "0x5d3a750093d65986185e0ac61bfb7638dafed997e8f47b5daa8f4a979aaef062",
-                    "nonce" : "0xc12cf814e84722c1",
+                    "hash" : "0x07fa76ff7725019b942f6802a1978d053093f3497ebbbcdf5d760f5530446d47",
+                    "mixHash" : "0x3a8b942530046ca74d7f5cbd5f049c8203ce4a8c8563e94bc66d3e2092fd7db7",
+                    "nonce" : "0x16734135e5b8b601",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05d3a750093d65986185e0ac61bfb7638dafed997e8f47b5daa8f4a979aaef06288c12cf814e84722c1c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03a8b942530046ca74d7f5cbd5f049c8203ce4a8c8563e94bc66d3e2092fd7db78816734135e5b8b601c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41e91af2cccfa9840193a723e81467414bcf4f72a17290ac00d92256e49826a0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x07fa76ff7725019b942f6802a1978d053093f3497ebbbcdf5d760f5530446d47",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g0v0_Metropolis" : {
+    "callOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe5bc225be38fe0540474ace115f7e7665f6f8ebd63355e246fda21318f3fc838",
-                    "mixHash" : "0xec6d3bb2061c94a7958c234553ec9ee2aa4ec510a000aad42465f86d6e16d601",
-                    "nonce" : "0xa71b0ffc6baea4a4",
+                    "hash" : "0x5af5f9908e7a41b21e4ed73eb8cb5b6ca93ac8e3c67b6f0debfb11dfd13aa479",
+                    "mixHash" : "0x864625b0dba31b8b5c2ecad4c1862e733a998f6396d08ec0f3f87745f6e0a91d",
+                    "nonce" : "0x41d84f6e4457f5d2",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x5a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3b6b80fc904f64f14d0dd1fb8224e5263b8b6d910035ae456ae140c8dc9291a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ec6d3bb2061c94a7958c234553ec9ee2aa4ec510a000aad42465f86d6e16d60188a71b0ffc6baea4a4c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0864625b0dba31b8b5c2ecad4c1862e733a998f6396d08ec0f3f87745f6e0a91d8841d84f6e4457f5d2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5bc225be38fe0540474ace115f7e7665f6f8ebd63355e246fda21318f3fc838",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5af5f9908e7a41b21e4ed73eb8cb5b6ca93ac8e3c67b6f0debfb11dfd13aa479",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x4fc5482585542b49c88863e9d6fa5f46021484e11555e8ff36ccff5ce3055b73",
+                    "mixHash" : "0x55e286bda948d305147ef5ebee672132d3bed5da9f27527e4da510f23ef6f838",
+                    "nonce" : "0x55f38acd4d802694",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a055e286bda948d305147ef5ebee672132d3bed5da9f27527e4da510f23ef6f8388855f38acd4d802694c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4fc5482585542b49c88863e9d6fa5f46021484e11555e8ff36ccff5ce3055b73",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
index ae798d158..6590fae58 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3Fail_d0g1v0_EIP150" : {
+    "callOutput3Fail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x70d0a4bb11e2e21cb407c7d22084ea82397e37f67726b2966428a6242a6b9ff5",
-                    "mixHash" : "0x627f377a4364838aca27f92f64f3955576239e91c24446c2c95236a6a6bdd0ef",
-                    "nonce" : "0xc0883c3b982ab17e",
+                    "hash" : "0xf358bda94a1f0f53b9be6a9fbd81a7131420f1206eae633678af697919d3a6f9",
+                    "mixHash" : "0xc126eec89284aa1ed4c1e1c7207704d943c81f1b0263925701b31787c85e1fc2",
+                    "nonce" : "0x4fc4200b567968ae",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
-                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0627f377a4364838aca27f92f64f3955576239e91c24446c2c95236a6a6bdd0ef88c0883c3b982ab17ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0c126eec89284aa1ed4c1e1c7207704d943c81f1b0263925701b31787c85e1fc2884fc4200b567968aef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70d0a4bb11e2e21cb407c7d22084ea82397e37f67726b2966428a6242a6b9ff5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xf358bda94a1f0f53b9be6a9fbd81a7131420f1206eae633678af697919d3a6f9",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_EIP158" : {
+    "callOutput3Fail_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x1a49fe3d12b757ae4fb0793a67eca579a3ece3f1af1eb91a0918ef61921f44bb",
-                    "mixHash" : "0x1771c5442f3d66af904cabc50a05c9b16d62532ab43bf254e745d553ef3fdfbf",
-                    "nonce" : "0xaf3b66ecde783853",
+                    "hash" : "0x5b8aed605adbbd4cd3f7db2da6d482557f94e3dedc486ce7f4ed5dc6cc27951b",
+                    "mixHash" : "0x5353e86b09cd859d5f7157fe4111080c02975e1774a36b65dc58a0ae7c4be69a",
+                    "nonce" : "0xa46386fde095684d",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
-                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a01771c5442f3d66af904cabc50a05c9b16d62532ab43bf254e745d553ef3fdfbf88af3b66ecde783853f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a05353e86b09cd859d5f7157fe4111080c02975e1774a36b65dc58a0ae7c4be69a88a46386fde095684df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a49fe3d12b757ae4fb0793a67eca579a3ece3f1af1eb91a0918ef61921f44bb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5b8aed605adbbd4cd3f7db2da6d482557f94e3dedc486ce7f4ed5dc6cc27951b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_Frontier" : {
+    "callOutput3Fail_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0xafa61e0f1f8ebf615abdebc01c6a27e7a70ed227b12c19eb7da6ae467e9a240e",
-                    "mixHash" : "0x971730924af96beeb4bf05c1caa0c10abb6ea55e1e6fa3233f65a17af6ddc70a",
-                    "nonce" : "0x41b7716fe82f60f1",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0xabcf65cbe2b64cd4a469cae4002a21ccb69fb8ee2da409bc57ed8b1a8c9af32a",
+                    "mixHash" : "0xafaca1e0e6b08d5211acf8370bb8ff60ff13b5558dfd0bea918f426f01b0023d",
+                    "nonce" : "0xd405752f0060dc9f",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
-                    "stateRoot" : "0x77422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47a",
+                    "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
+                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0971730924af96beeb4bf05c1caa0c10abb6ea55e1e6fa3233f65a17af6ddc70a8841b7716fe82f60f1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0afaca1e0e6b08d5211acf8370bb8ff60ff13b5558dfd0bea918f426f01b0023d88d405752f0060dc9ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafa61e0f1f8ebf615abdebc01c6a27e7a70ed227b12c19eb7da6ae467e9a240e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xabcf65cbe2b64cd4a469cae4002a21ccb69fb8ee2da409bc57ed8b1a8c9af32a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_Homestead" : {
+    "callOutput3Fail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163c9",
-                    "hash" : "0xa95a7f5606f0cb1a0c5d1fdd1ef595c5323144f8cfea93c84c6bd51beb8e15c8",
-                    "mixHash" : "0x5ca3fe1f05cf8c1fb176efc07b2fec1cf925c4ffb4dde5193a07face55ada433",
-                    "nonce" : "0x307ac9ef5219f0f4",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0x5e86fcb3f81d9bcb69bc1d7211a923f25c2b5cbf08fe4f5994e3a8c4f7f7d455",
+                    "mixHash" : "0xcdf0c5b12b2aae1b5b37e5ede87bedcc544308c205e2eaad264604ccc3a11c36",
+                    "nonce" : "0x02b892e9be3e2a2c",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
+                    "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
                     "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a05ca3fe1f05cf8c1fb176efc07b2fec1cf925c4ffb4dde5193a07face55ada43388307ac9ef5219f0f4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cdf0c5b12b2aae1b5b37e5ede87bedcc544308c205e2eaad264604ccc3a11c368802b892e9be3e2a2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa95a7f5606f0cb1a0c5d1fdd1ef595c5323144f8cfea93c84c6bd51beb8e15c8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5e86fcb3f81d9bcb69bc1d7211a923f25c2b5cbf08fe4f5994e3a8c4f7f7d455",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_Metropolis" : {
+    "callOutput3Fail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0xbbc1f140ec443e3e30a75e239cb5fd671043135b5a4780bae7d131558a68a3ee",
-                    "mixHash" : "0x597779bbed90eede1d43a99b2148b919cd660a805e6473844268b2d49af70459",
-                    "nonce" : "0xa998895d7778e82e",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0xeb8a4b3605bcbfc91bc376514e678164700a5e2df38a4c1d9d7a45fdd9529df5",
+                    "mixHash" : "0xaf3d2e9cd67b5f58950bdff16b93b5523e69e036d34657b5bc04dc465bd1bca0",
+                    "nonce" : "0x36a9b65b33f4e965",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x94df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2",
+                    "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
+                    "stateRoot" : "0x77422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094df4fc0cccd12815822fc04e3bdeaff93925ce237589a90c6a69a9ce02549d2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0597779bbed90eede1d43a99b2148b919cd660a805e6473844268b2d49af7045988a998895d7778e82ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0af3d2e9cd67b5f58950bdff16b93b5523e69e036d34657b5bc04dc465bd1bca08836a9b65b33f4e965f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbbc1f140ec443e3e30a75e239cb5fd671043135b5a4780bae7d131558a68a3ee",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xeb8a4b3605bcbfc91bc376514e678164700a5e2df38a4c1d9d7a45fdd9529df5",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3Fail_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0163c9",
+                    "hash" : "0x70fa6b532f6efd276bfb8a0b0fd6abf9bba103c416d390cdb3a9269df7bf8b90",
+                    "mixHash" : "0xe2f4ff7cd899f19055fec59b7468e989921e8b42c2d882e19e58d585f9128d78",
+                    "nonce" : "0x15ee2f60ebfd6156",
+                    "number" : "0x01",
+                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+                    "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
+                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0e2f4ff7cd899f19055fec59b7468e989921e8b42c2d882e19e58d585f9128d788815ee2f60ebfd6156f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70fa6b532f6efd276bfb8a0b0fd6abf9bba103c416d390cdb3a9269df7bf8b90",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
index eef14bb93..6b3159d02 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3_d0g0v0_EIP150" : {
+    "callOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x257eca08bb19a7be3b306a1f5a189d63b2e7b674ab3e000712ab07a9ead8a0f1",
-                    "mixHash" : "0xc0dda0658427580ba8b69cfe7b89ec0518e67db6a8c9ffa5efe7c7e5ba06e034",
-                    "nonce" : "0x40bb4cb3b8330eb8",
+                    "hash" : "0x632f2fe2293542b33f253d7abb31e4650b2489267a04ce3bc0247391bef6d163",
+                    "mixHash" : "0x0e7c3752966fc8fc7f5eca7ab5bfda615b3fe996f32a0b1d097ffdbabd3191a0",
+                    "nonce" : "0x1abc38fbe011ce94",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c0dda0658427580ba8b69cfe7b89ec0518e67db6a8c9ffa5efe7c7e5ba06e0348840bb4cb3b8330eb8c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00e7c3752966fc8fc7f5eca7ab5bfda615b3fe996f32a0b1d097ffdbabd3191a0881abc38fbe011ce94c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x257eca08bb19a7be3b306a1f5a189d63b2e7b674ab3e000712ab07a9ead8a0f1",
-        "network" : "EIP150",
+        "lastblockhash" : "0x632f2fe2293542b33f253d7abb31e4650b2489267a04ce3bc0247391bef6d163",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput3_d0g0v0_EIP158" : {
+    "callOutput3_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5680318d305c6c60f494537f98d11d70c8b3b9e06425ec987aa1e10a7ea58999",
-                    "mixHash" : "0x1cb101c367b098ec1c3b550a1d8bd33b714828b44d252f41b4dde2e0009bf224",
-                    "nonce" : "0xcb54d275272c6739",
+                    "hash" : "0x12320652bb9e091746fb8e47afca7bd2444a9b645f8d5d467dd080e4ea98ded3",
+                    "mixHash" : "0x85484a3110d06eb66483014e7b15176335af588e9812a9b3b93356673d926d7a",
+                    "nonce" : "0x1a6783b79dd409ea",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01cb101c367b098ec1c3b550a1d8bd33b714828b44d252f41b4dde2e0009bf22488cb54d275272c6739c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a085484a3110d06eb66483014e7b15176335af588e9812a9b3b93356673d926d7a881a6783b79dd409eac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5680318d305c6c60f494537f98d11d70c8b3b9e06425ec987aa1e10a7ea58999",
-        "network" : "EIP158",
+        "lastblockhash" : "0x12320652bb9e091746fb8e47afca7bd2444a9b645f8d5d467dd080e4ea98ded3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput3_d0g0v0_Frontier" : {
+    "callOutput3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5141f6bb607c41182c77a775f51b681af48023085aacb48e9d0c50d688424d9b",
-                    "mixHash" : "0x9276ea9bbd7a8ae274072db35615ca900026ce8653c90c0350354673ddc39d97",
-                    "nonce" : "0x007d302aa1e11870",
+                    "hash" : "0xf5f587c74e3c6f721be38a5c468c127b2b6400b9a4821dce8fd3b4dba5459da2",
+                    "mixHash" : "0x8c4e801aa4da59493d170f6e52ef1c992d95fb0a614e95cc8a71f393418d3a76",
+                    "nonce" : "0x20fa176a060ee22c",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09276ea9bbd7a8ae274072db35615ca900026ce8653c90c0350354673ddc39d9788007d302aa1e11870c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08c4e801aa4da59493d170f6e52ef1c992d95fb0a614e95cc8a71f393418d3a768820fa176a060ee22cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5141f6bb607c41182c77a775f51b681af48023085aacb48e9d0c50d688424d9b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf5f587c74e3c6f721be38a5c468c127b2b6400b9a4821dce8fd3b4dba5459da2",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput3_d0g0v0_Homestead" : {
+    "callOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc41ddc56e435db34fad584ca72851f058047580b599c0c8a68ace8f69181cc18",
-                    "mixHash" : "0xfdde23a12df7957e545bca762f8058f7d1a5d34beab96d14d1962bcc49f64e19",
-                    "nonce" : "0xb58eb1e124b35b3c",
+                    "hash" : "0xd0e5abdebced6bca9ae29fd0e121b80aafeb40b7df94a3b26fe816977987b80b",
+                    "mixHash" : "0xd97205c467b10f74e6a9109ad150e81426024cdb6f2da5db6cf89132081fd476",
+                    "nonce" : "0xc979106ab28528b5",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fdde23a12df7957e545bca762f8058f7d1a5d34beab96d14d1962bcc49f64e1988b58eb1e124b35b3cc0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d97205c467b10f74e6a9109ad150e81426024cdb6f2da5db6cf89132081fd47688c979106ab28528b5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc41ddc56e435db34fad584ca72851f058047580b599c0c8a68ace8f69181cc18",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd0e5abdebced6bca9ae29fd0e121b80aafeb40b7df94a3b26fe816977987b80b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput3_d0g0v0_Metropolis" : {
+    "callOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x050c430ee8463d6d79473c8ef3cf75df2d37d8993e2a5aedaf470f94b107f205",
-                    "mixHash" : "0xba57a36c05fada0dcd11d896c0cb317c9ac5cb8a871cc62a8ac725721a9cfaea",
-                    "nonce" : "0x3fa2ce3cde87dd01",
+                    "hash" : "0x9d79d2884067d3ba37805a8c7f18d1e3b225300155fc96e79ebb14700364c788",
+                    "mixHash" : "0xc261b2406228a3e0cd55a90976c4796f5d20838a4a8e95886b0673a0e60495b5",
+                    "nonce" : "0x927200f359bd35b1",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ba57a36c05fada0dcd11d896c0cb317c9ac5cb8a871cc62a8ac725721a9cfaea883fa2ce3cde87dd01c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c261b2406228a3e0cd55a90976c4796f5d20838a4a8e95886b0673a0e60495b588927200f359bd35b1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x050c430ee8463d6d79473c8ef3cf75df2d37d8993e2a5aedaf470f94b107f205",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9d79d2884067d3ba37805a8c7f18d1e3b225300155fc96e79ebb14700364c788",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xc3369f9a200ba5779cfe9be23357b90d2f6062a19257e4c4b82428c23b6fc53f",
+                    "mixHash" : "0x62f4fb0f929102bbf7ec4c60f9cff5bd430e40df52c04e461e1cc7cca26bfac3",
+                    "nonce" : "0x6e4b2689a852de90",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a062f4fb0f929102bbf7ec4c60f9cff5bd430e40df52c04e461e1cc7cca26bfac3886e4b2689a852de90c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc3369f9a200ba5779cfe9be23357b90d2f6062a19257e4c4b82428c23b6fc53f",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
index c3003cba3..f2a88bff8 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3_d0g1v0_EIP150" : {
+    "callOutput3_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xdc9dca55184d4aa34ff208fde601c7db3ad5bbca4880d6b0c793b56c8476bf3a",
-                    "mixHash" : "0x93b4495f83a49e4ee7f5028480da90724b1bd0dc96fd02ec91f38d5c3d06a99a",
-                    "nonce" : "0xc404a106294904aa",
+                    "hash" : "0xc05eb75aa3fb25056ca4696af93ba49e66182e346d985fd5cab24935c72000f6",
+                    "mixHash" : "0xf428232e260da7208f066cb52d03b30014202bea8515f489fe3393a76257fcbf",
+                    "nonce" : "0x6cd3e0c1f0ad45d9",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
-                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a093b4495f83a49e4ee7f5028480da90724b1bd0dc96fd02ec91f38d5c3d06a99a88c404a106294904aaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f428232e260da7208f066cb52d03b30014202bea8515f489fe3393a76257fcbf886cd3e0c1f0ad45d9f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc9dca55184d4aa34ff208fde601c7db3ad5bbca4880d6b0c793b56c8476bf3a",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc05eb75aa3fb25056ca4696af93ba49e66182e346d985fd5cab24935c72000f6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput3_d0g1v0_EIP158" : {
+    "callOutput3_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x67cc8829a1cb1953d4c159c71fa1a967733d663efcba9141b697d9832ffa7c4e",
-                    "mixHash" : "0xff7b117e81ade86555926022a3e6b8ef6cbbe0c7a7eb2a449cb1b5b15f9cf90f",
-                    "nonce" : "0x51e9fddb277b3d4e",
+                    "hash" : "0xe5576f3dab1eb71fb0d6da3419131035844a64ec63818b2e57ef1993656b5442",
+                    "mixHash" : "0x421de6e567e7bacfb6069105017c3a1512dea35bcf12eee2239e2a4057140cc7",
+                    "nonce" : "0x0a74d4885b3bb70b",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
-                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0ff7b117e81ade86555926022a3e6b8ef6cbbe0c7a7eb2a449cb1b5b15f9cf90f8851e9fddb277b3d4ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0421de6e567e7bacfb6069105017c3a1512dea35bcf12eee2239e2a4057140cc7880a74d4885b3bb70bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67cc8829a1cb1953d4c159c71fa1a967733d663efcba9141b697d9832ffa7c4e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5576f3dab1eb71fb0d6da3419131035844a64ec63818b2e57ef1993656b5442",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput3_d0g1v0_Frontier" : {
+    "callOutput3_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x5dd422f4f422e1f5fb34d79325e895a4fd69b0802f076142eb233fea74f37af7",
-                    "mixHash" : "0xaf803072466b1624c9a8c355b1549e9124bc791c9fac458b4eaeedf9c26db131",
-                    "nonce" : "0x9c01035259a0fb27",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x28a5b19c43e27fad94912919690b533fe5800b50d54d71cff914bda981e6f333",
+                    "mixHash" : "0x3a12f33b85824cb8068df78bbefd725ccb77c8ade0b13f5ecaf9f7e3c3275f6d",
+                    "nonce" : "0xaad9e7beff74e697",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
-                    "stateRoot" : "0x40714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92",
+                    "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
+                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0af803072466b1624c9a8c355b1549e9124bc791c9fac458b4eaeedf9c26db131889c01035259a0fb27f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a03a12f33b85824cb8068df78bbefd725ccb77c8ade0b13f5ecaf9f7e3c3275f6d88aad9e7beff74e697f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5dd422f4f422e1f5fb34d79325e895a4fd69b0802f076142eb233fea74f37af7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x28a5b19c43e27fad94912919690b533fe5800b50d54d71cff914bda981e6f333",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput3_d0g1v0_Homestead" : {
+    "callOutput3_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "0x91ad8645ea2031cc418d6ff94198683e0c39f950914e101f3e859f6000a21c1a",
-                    "mixHash" : "0x5f51e36dcb6d4b002850841bb783a4e83927d2fa17c290d2fc210ac9c233b8f8",
-                    "nonce" : "0x30aebf351a9d7250",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0xf068d86a1307db306ebe2ce69ba927430c0f4a2ebea63a84b2e2e4e920d09d89",
+                    "mixHash" : "0xf87809ed052e20ef8d709aebba806dc6607e7c3686ac7303513084d5b068ab34",
+                    "nonce" : "0x2a9e0bee6161cced",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
+                    "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
                     "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a05f51e36dcb6d4b002850841bb783a4e83927d2fa17c290d2fc210ac9c233b8f88830aebf351a9d7250f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f87809ed052e20ef8d709aebba806dc6607e7c3686ac7303513084d5b068ab34882a9e0bee6161ccedf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91ad8645ea2031cc418d6ff94198683e0c39f950914e101f3e859f6000a21c1a",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf068d86a1307db306ebe2ce69ba927430c0f4a2ebea63a84b2e2e4e920d09d89",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput3_d0g1v0_Metropolis" : {
+    "callOutput3_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xf89de737022044dae49e770a79e1d97d34f72dcf4bd5b270271adde22d3acc05",
-                    "mixHash" : "0x70332010ff2b5b3e337fbfdcc46579dfd2dde41505a50fb7b5227c704be27c06",
-                    "nonce" : "0xc8e7d0eac5c85b87",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x0747777a52be2881e277b6b457a795f5c74b2a66dd811954ef75a80f0ef0fe28",
+                    "mixHash" : "0xeec6d1de81f1a301c86714539affe000b132b101992de100fe6f0749cd13c22f",
+                    "nonce" : "0x250baa9813ef1d05",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0xab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764",
+                    "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
+                    "stateRoot" : "0x40714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ab15e3e403219f8defdacfd154c66e43a43421180bb8efb49383d2e09c2aa764a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a070332010ff2b5b3e337fbfdcc46579dfd2dde41505a50fb7b5227c704be27c0688c8e7d0eac5c85b87f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0eec6d1de81f1a301c86714539affe000b132b101992de100fe6f0749cd13c22f88250baa9813ef1d05f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf89de737022044dae49e770a79e1d97d34f72dcf4bd5b270271adde22d3acc05",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0747777a52be2881e277b6b457a795f5c74b2a66dd811954ef75a80f0ef0fe28",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x98afd96930b0a80123568601716dd2ac7aa73c34e6a324e4b508531d85ea6c43",
+                    "mixHash" : "0x7a10ccfc69e0b772ce9adfe4bc6f18802e96ecb591bed500b6cec71b2b837ad0",
+                    "nonce" : "0xee5bff38c18da114",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
+                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a07a10ccfc69e0b772ce9adfe4bc6f18802e96ecb591bed500b6cec71b2b837ad088ee5bff38c18da114f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x98afd96930b0a80123568601716dd2ac7aa73c34e6a324e4b508531d85ea6c43",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
index f3c10df0b..330c5683f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3partialFail_d0g0v0_EIP150" : {
+    "callOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x62a0f6b37f64a78a93fae1116d502758d55e9e8cd72d49d76a86a6c8d49a3c9d",
-                    "mixHash" : "0xbc2faf23c79d4e3a4e9d3afd58cb63ff9389916cba4ce9533348e10fde5cac24",
-                    "nonce" : "0x03691c5e4a09e2c6",
+                    "hash" : "0x36a214dd6dd42f3f3b76b9c8887ab08382f00e824c66c32d4a9e23d1c99e8fd4",
+                    "mixHash" : "0xfaab1f246c9848c150de3ae096daeaf27ce1e8f757b961be457207a9449ed123",
+                    "nonce" : "0x5b9277ba289685e9",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bc2faf23c79d4e3a4e9d3afd58cb63ff9389916cba4ce9533348e10fde5cac248803691c5e4a09e2c6c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0faab1f246c9848c150de3ae096daeaf27ce1e8f757b961be457207a9449ed123885b9277ba289685e9c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62a0f6b37f64a78a93fae1116d502758d55e9e8cd72d49d76a86a6c8d49a3c9d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x36a214dd6dd42f3f3b76b9c8887ab08382f00e824c66c32d4a9e23d1c99e8fd4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_EIP158" : {
+    "callOutput3partialFail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd4b30bdc669ea45a2f3746e93732f4261e84133b91fc234770d27244c60831ad",
-                    "mixHash" : "0x6899b09d493d726e5338ec10aef45461bd9893a2330c2cdf31eeba81b78d2aa7",
-                    "nonce" : "0x2ee2d1058aca7df3",
+                    "hash" : "0x9570e13e1f37b6be7af2f7915757de05960f52b109ec836e53234f58479d0d0f",
+                    "mixHash" : "0xaca4ae484c3712a643616d6718f9633f04294ac6217783406f4a93e5b3d8b625",
+                    "nonce" : "0x03e1ecb17b3b35ae",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06899b09d493d726e5338ec10aef45461bd9893a2330c2cdf31eeba81b78d2aa7882ee2d1058aca7df3c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0aca4ae484c3712a643616d6718f9633f04294ac6217783406f4a93e5b3d8b6258803e1ecb17b3b35aec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4b30bdc669ea45a2f3746e93732f4261e84133b91fc234770d27244c60831ad",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9570e13e1f37b6be7af2f7915757de05960f52b109ec836e53234f58479d0d0f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_Frontier" : {
+    "callOutput3partialFail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xceb071d1e689334c58906530477adb8aaf11fa9adbc8b3be30b1b0f9daa4b56f",
-                    "mixHash" : "0x7014bbaa8b8ebe0cd811db3c16d75684eee80876cae609cf3398ca728bdfd93d",
-                    "nonce" : "0xc79d78894b8a9059",
+                    "hash" : "0x9f60ad3e7d66220e3b68cf55ea6771df83aeb05cb7ae9279206c35e6738f11ef",
+                    "mixHash" : "0x2117ffffe143c96757242bfdfdf8a818c85d3c1bdf262f5092c2c1c02aaec8bb",
+                    "nonce" : "0x3f3881b4da5bba6c",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07014bbaa8b8ebe0cd811db3c16d75684eee80876cae609cf3398ca728bdfd93d88c79d78894b8a9059c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02117ffffe143c96757242bfdfdf8a818c85d3c1bdf262f5092c2c1c02aaec8bb883f3881b4da5bba6cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xceb071d1e689334c58906530477adb8aaf11fa9adbc8b3be30b1b0f9daa4b56f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9f60ad3e7d66220e3b68cf55ea6771df83aeb05cb7ae9279206c35e6738f11ef",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_Homestead" : {
+    "callOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8bcdbd1b6a6987d318d8b7e24c9cee7727bde597211f33a3c65054618a851777",
-                    "mixHash" : "0x07559de5f2f3987b70a6841743f3956896253d3fef331eb5dd2d1608802ff2a8",
-                    "nonce" : "0x88ad962471820136",
+                    "hash" : "0x4be125aad1c4bb7075c6b1eabf4ac193a3cdbd50fe47c4fd0369a4b45ff7b2d5",
+                    "mixHash" : "0x8b3017e0b35e4dd0cfdf027564707514adfdf90177541b6263ef13d9f93114e6",
+                    "nonce" : "0xb19398daa2f7c2e6",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007559de5f2f3987b70a6841743f3956896253d3fef331eb5dd2d1608802ff2a88888ad962471820136c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08b3017e0b35e4dd0cfdf027564707514adfdf90177541b6263ef13d9f93114e688b19398daa2f7c2e6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bcdbd1b6a6987d318d8b7e24c9cee7727bde597211f33a3c65054618a851777",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4be125aad1c4bb7075c6b1eabf4ac193a3cdbd50fe47c4fd0369a4b45ff7b2d5",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g0v0_Metropolis" : {
+    "callOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4f97f1c734fbda73f059790e708b17be8beed85e458b242536e5e56af9e40b58",
-                    "mixHash" : "0x711a25a80805d9b7f1664e78035fcc068d26d66ae652b05c5df7a35806a6e03c",
-                    "nonce" : "0x1060e21c8ef4c4a7",
+                    "hash" : "0x53c339fba69ce693efc936329050b1db1f3d990968f37486f4ea3a978afc8940",
+                    "mixHash" : "0x47721121da08d1921bb66cac8063032e3623fba44b8e552ae8fe3126f5cffede",
+                    "nonce" : "0x23bf1c3546a68f7f",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0711a25a80805d9b7f1664e78035fcc068d26d66ae652b05c5df7a35806a6e03c881060e21c8ef4c4a7c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047721121da08d1921bb66cac8063032e3623fba44b8e552ae8fe3126f5cffede8823bf1c3546a68f7fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f97f1c734fbda73f059790e708b17be8beed85e458b242536e5e56af9e40b58",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x53c339fba69ce693efc936329050b1db1f3d990968f37486f4ea3a978afc8940",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xb46dd2290b9763174b703151e3142216664b05873afe0beed633846699e329d0",
+                    "mixHash" : "0x80b2b5c109e4620444c9b55ab4552c768952082c827763ee8b0021b4b09e7627",
+                    "nonce" : "0xa41a295ad42023c2",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a080b2b5c109e4620444c9b55ab4552c768952082c827763ee8b0021b4b09e762788a41a295ad42023c2c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb46dd2290b9763174b703151e3142216664b05873afe0beed633846699e329d0",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
index 2b6e03de0..020ce49ec 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3partialFail_d0g1v0_EIP150" : {
+    "callOutput3partialFail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x1c92fc02992aae8d97055b5b43603a4b739064c6a701e4818fe19046a3283096",
-                    "mixHash" : "0x01bc6c5af45f6a787422d87ed5253f4faa4220698362d6213efb364f6ec606b9",
-                    "nonce" : "0x1e029e1ee6d6be0f",
+                    "hash" : "0xb52c516c298570e579db23c5e6d5961cb198f3d1fed9dd91251e9e2c79b9296f",
+                    "mixHash" : "0x9402b72b31fd80bb38cb193b45db60ad790ffdc095c601391905d34a18c22a81",
+                    "nonce" : "0x49d9bbf6b579065f",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
-                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a001bc6c5af45f6a787422d87ed5253f4faa4220698362d6213efb364f6ec606b9881e029e1ee6d6be0ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a09402b72b31fd80bb38cb193b45db60ad790ffdc095c601391905d34a18c22a818849d9bbf6b579065ff865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c92fc02992aae8d97055b5b43603a4b739064c6a701e4818fe19046a3283096",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb52c516c298570e579db23c5e6d5961cb198f3d1fed9dd91251e9e2c79b9296f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_EIP158" : {
+    "callOutput3partialFail_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x65dceb0537b750ca3c5214af3b247d9f75e76cd2243b3f482552f6ce4bdf2c69",
-                    "mixHash" : "0x6d07ad34a7661398f2915d62d78ae0805721bd6df25864c25a09353ec2f26662",
-                    "nonce" : "0xae7ee824feff849a",
+                    "hash" : "0xafdea0cbda550d02fb59fb50fc707de91e34ac0f91e4c34f002bbcee38523d89",
+                    "mixHash" : "0x3f0fa86c0af4b32a65f473f9b629c3c9e312a1f5a17bd0d51889485bc1bb2879",
+                    "nonce" : "0xb4f768c601cc8442",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
-                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
+                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a06d07ad34a7661398f2915d62d78ae0805721bd6df25864c25a09353ec2f2666288ae7ee824feff849af865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a03f0fa86c0af4b32a65f473f9b629c3c9e312a1f5a17bd0d51889485bc1bb287988b4f768c601cc8442f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65dceb0537b750ca3c5214af3b247d9f75e76cd2243b3f482552f6ce4bdf2c69",
-        "network" : "EIP158",
+        "lastblockhash" : "0xafdea0cbda550d02fb59fb50fc707de91e34ac0f91e4c34f002bbcee38523d89",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_Frontier" : {
+    "callOutput3partialFail_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x7355f3146bf9abadaf619e41165b18731bc2ed42611e54efd4ac9653289c4432",
-                    "mixHash" : "0xe1ed36351713288d615111a82bac210812acaf0c7f601fc219b83404f46ff97d",
-                    "nonce" : "0x6b8b882d09640caa",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0xf86e8030419fbb61e3eba6400cdadd0a50591921d32733f7bd746ba2633fbb2f",
+                    "mixHash" : "0xa65df870abb79b8929b8e31491feb48fb840b4626b48d49a6d23c47db8e539be",
+                    "nonce" : "0xfc4f93a801c6a5c5",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
-                    "stateRoot" : "0xf28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382",
+                    "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
+                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0e1ed36351713288d615111a82bac210812acaf0c7f601fc219b83404f46ff97d886b8b882d09640caaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0a65df870abb79b8929b8e31491feb48fb840b4626b48d49a6d23c47db8e539be88fc4f93a801c6a5c5f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7355f3146bf9abadaf619e41165b18731bc2ed42611e54efd4ac9653289c4432",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf86e8030419fbb61e3eba6400cdadd0a50591921d32733f7bd746ba2633fbb2f",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_Homestead" : {
+    "callOutput3partialFail_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0163c9",
-                    "hash" : "0x0e8e9ce7b6c56e1ae5d9a53ffe4751b1e32b897c28640cc6c73b23a194219e17",
-                    "mixHash" : "0x56f74fae9c04ccdf9e55300fe8418d1d82b8607cc3650ea4242f522703d755fa",
-                    "nonce" : "0x767084f41b8eff08",
+                    "gasUsed" : "0x01665d",
+                    "hash" : "0xb6d7c6f8299c7e71575adc9609b46ec3681a636708ac290135ee1725411ed89b",
+                    "mixHash" : "0xcd57f4d224da651a7cac8e5ddddacb51200b08dd2b07adf7ced3ee8eeec3bee6",
+                    "nonce" : "0xf18016b1fe2d7d62",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
+                    "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
                     "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a056f74fae9c04ccdf9e55300fe8418d1d82b8607cc3650ea4242f522703d755fa88767084f41b8eff08f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cd57f4d224da651a7cac8e5ddddacb51200b08dd2b07adf7ced3ee8eeec3bee688f18016b1fe2d7d62f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e8e9ce7b6c56e1ae5d9a53ffe4751b1e32b897c28640cc6c73b23a194219e17",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb6d7c6f8299c7e71575adc9609b46ec3681a636708ac290135ee1725411ed89b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_Metropolis" : {
+    "callOutput3partialFail_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0xc370e419d7333dd1cb5c4558fab3d3f9de5615e06207b9de96c1da0a1bc643a2",
-                    "mixHash" : "0x1dc7e12439dc54b7bfe9099e8e03bc4e00998b9d37d5b165d23b1806589481fa",
-                    "nonce" : "0x5c558c773cc7d7b0",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0xd7a31cf8fe2f4ea7166010b55652336e69cb1083c8463b2a49a8945a0d9c74a7",
+                    "mixHash" : "0xe25879d9473f4b5091f1daf8766e5c716940a960c30e2ff2f1fc1ae690e18082",
+                    "nonce" : "0xbf26013a36c34ff2",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
-                    "stateRoot" : "0x5a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637d",
+                    "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
+                    "stateRoot" : "0xf28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a446a8e837d9c42bc84c9de34b1b1b42cc50a923dccbf5068e7093fe090637da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a01dc7e12439dc54b7bfe9099e8e03bc4e00998b9d37d5b165d23b1806589481fa885c558c773cc7d7b0f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0e25879d9473f4b5091f1daf8766e5c716940a960c30e2ff2f1fc1ae690e1808288bf26013a36c34ff2f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc370e419d7333dd1cb5c4558fab3d3f9de5615e06207b9de96c1da0a1bc643a2",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd7a31cf8fe2f4ea7166010b55652336e69cb1083c8463b2a49a8945a0d9c74a7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partialFail_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0163c9",
+                    "hash" : "0x9ae0cab7dba9a675edf13a737e8771f6a6be6e12e56e4976e3d84929a332ca9f",
+                    "mixHash" : "0x1113569b7f396627c935d4a59ec83c934319ef04f873ca702974acb458dccc49",
+                    "nonce" : "0x5ee54cba68dac4e9",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
+                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a01113569b7f396627c935d4a59ec83c934319ef04f873ca702974acb458dccc49885ee54cba68dac4e9f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9ae0cab7dba9a675edf13a737e8771f6a6be6e12e56e4976e3d84929a332ca9f",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
index 32c0cc66b..f9ec76a23 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3partial_d0g0v0_EIP150" : {
+    "callOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x676cd1e7455b9ba306ef301b7687bad3114094c519d445b7312f97db0858c7b1",
-                    "mixHash" : "0x76949db66247718969b88accfa215d7a917c150a5fd66a5d7dadd6837eb922f4",
-                    "nonce" : "0x44cfb8c73368fcc3",
+                    "hash" : "0xeecee9ebc1324a34d0f872820c2d5c5581edd87482eea88eb0fa97a61926fc02",
+                    "mixHash" : "0x4d262c4ae99d5bc27f5fadc93dea82a4b33fbd27fb885e8037dd2de644b3c29b",
+                    "nonce" : "0x290efb562f5f49d8",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a076949db66247718969b88accfa215d7a917c150a5fd66a5d7dadd6837eb922f48844cfb8c73368fcc3c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04d262c4ae99d5bc27f5fadc93dea82a4b33fbd27fb885e8037dd2de644b3c29b88290efb562f5f49d8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x676cd1e7455b9ba306ef301b7687bad3114094c519d445b7312f97db0858c7b1",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeecee9ebc1324a34d0f872820c2d5c5581edd87482eea88eb0fa97a61926fc02",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_EIP158" : {
+    "callOutput3partial_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa5775876266b8cfb8de1d82be638d170b81d50adee2cd0e314dc63750075b5c8",
-                    "mixHash" : "0x70bee2eb119c9cf2522af54e1be3de57abcf4c68616a3762a839e5b3961ba51b",
-                    "nonce" : "0x749d2e2b1422a451",
+                    "hash" : "0x5ce640c6e517d7025caab3377ad5d8c4bf2f8b5bb9b65e7512da5ace8c5f29b3",
+                    "mixHash" : "0xf0a2a41bb676c3397dae7e30d72c87d0ed82654335bb2b7c1fc5fcc4503d301b",
+                    "nonce" : "0x86cb693ea0650878",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a070bee2eb119c9cf2522af54e1be3de57abcf4c68616a3762a839e5b3961ba51b88749d2e2b1422a451c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f0a2a41bb676c3397dae7e30d72c87d0ed82654335bb2b7c1fc5fcc4503d301b8886cb693ea0650878c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5775876266b8cfb8de1d82be638d170b81d50adee2cd0e314dc63750075b5c8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5ce640c6e517d7025caab3377ad5d8c4bf2f8b5bb9b65e7512da5ace8c5f29b3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_Frontier" : {
+    "callOutput3partial_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa427dc9da03e444fec838b80175fecd824124bd56a723f15eb8eee6e85df4974",
-                    "mixHash" : "0xd72c0c3b3a92f8bf31c61559adf35172c7f1de910f4692ed6ce500f4524fe25f",
-                    "nonce" : "0x7ad8cafb49d82e99",
+                    "hash" : "0x7aeb5f5f164c96a70cc6f736d1763648cc6228048279653722645878e0da2fd1",
+                    "mixHash" : "0x2600edeecf97656dc6b6536412f9162ca6c86fca22d31daec6c0808f7814da37",
+                    "nonce" : "0x8d28f17d6b3714e7",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d72c0c3b3a92f8bf31c61559adf35172c7f1de910f4692ed6ce500f4524fe25f887ad8cafb49d82e99c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02600edeecf97656dc6b6536412f9162ca6c86fca22d31daec6c0808f7814da37888d28f17d6b3714e7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa427dc9da03e444fec838b80175fecd824124bd56a723f15eb8eee6e85df4974",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7aeb5f5f164c96a70cc6f736d1763648cc6228048279653722645878e0da2fd1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_Homestead" : {
+    "callOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x6251270046434d33f06418f0298ebb6c1250bc2d6c44e752a99efb2258b30409",
-                    "mixHash" : "0x0d7caaebdce361b2b418e661a48289b05c80b98a871e49d109d5030924de8b1e",
-                    "nonce" : "0x6d39d001d80ea198",
+                    "hash" : "0x34c4fe45bcf80efe6196e19a2654066854213e1d2285ecba5960518fb522dd7a",
+                    "mixHash" : "0xff134400c614767acaf62225cbc70a9e9009f643514f56ce72bddcf63dadca41",
+                    "nonce" : "0x4acc735db3c4b0d8",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00d7caaebdce361b2b418e661a48289b05c80b98a871e49d109d5030924de8b1e886d39d001d80ea198c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ff134400c614767acaf62225cbc70a9e9009f643514f56ce72bddcf63dadca41884acc735db3c4b0d8c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6251270046434d33f06418f0298ebb6c1250bc2d6c44e752a99efb2258b30409",
-        "network" : "Homestead",
+        "lastblockhash" : "0x34c4fe45bcf80efe6196e19a2654066854213e1d2285ecba5960518fb522dd7a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callOutput3partial_d0g0v0_Metropolis" : {
+    "callOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3be11985b30f6acbd9b795dbeb8b35da8376ff4f1beadf432ad00120c63aa8c3",
-                    "mixHash" : "0x6266886699d3a76aed061ddcd77a091263d2797b1f886998b94af90446adaf0a",
-                    "nonce" : "0x527babe8253b5970",
+                    "hash" : "0xa7add62ebdd8904bf52c450914d4beeb7299b4cf66f9ca73dbc988f9df27416c",
+                    "mixHash" : "0x64c440d2ed30192bab69e8b34206c7844aff5ddb2867f44fef76a73bc4adddf5",
+                    "nonce" : "0xe3ceb9a34c5d49c5",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06266886699d3a76aed061ddcd77a091263d2797b1f886998b94af90446adaf0a88527babe8253b5970c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a064c440d2ed30192bab69e8b34206c7844aff5ddb2867f44fef76a73bc4adddf588e3ceb9a34c5d49c5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3be11985b30f6acbd9b795dbeb8b35da8376ff4f1beadf432ad00120c63aa8c3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa7add62ebdd8904bf52c450914d4beeb7299b4cf66f9ca73dbc988f9df27416c",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x534e3d690aa7bb3b2396483757f395d5c329b81609f9866d9a21daf0f7875fe3",
+                    "mixHash" : "0x0954e5b5cce6b964de5497a7eddd81ba991c27ec7e82fdd5e2d83bca20217c47",
+                    "nonce" : "0x4dbaf893b2e007f7",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00954e5b5cce6b964de5497a7eddd81ba991c27ec7e82fdd5e2d83bca20217c47884dbaf893b2e007f7c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x534e3d690aa7bb3b2396483757f395d5c329b81609f9866d9a21daf0f7875fe3",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
index f35f4482f..03fb4fc73 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "callOutput3partial_d0g1v0_EIP150" : {
+    "callOutput3partial_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x5f1f8669fd993579d2b1e4ef415c3d686376eea8e495720fd66e6ac8c4b0b15b",
-                    "mixHash" : "0x6b7686b29f2d0efd80c0c2894fa3d3b1d7c9e1136ed0aab9e9eae9a6ba076cbe",
-                    "nonce" : "0xd07975bab1bd2ad8",
+                    "hash" : "0x5a1b4e9af19c9f8ffe394ca80e78db46cb7d87b6e4b518b0af760be47595864c",
+                    "mixHash" : "0x15fa1f6f2404507e536d41c794e6bd50bdfa93c8472fbb1841e1c576c44f2c10",
+                    "nonce" : "0xc7fb9f352cb307e3",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
-                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a06b7686b29f2d0efd80c0c2894fa3d3b1d7c9e1136ed0aab9e9eae9a6ba076cbe88d07975bab1bd2ad8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a015fa1f6f2404507e536d41c794e6bd50bdfa93c8472fbb1841e1c576c44f2c1088c7fb9f352cb307e3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f1f8669fd993579d2b1e4ef415c3d686376eea8e495720fd66e6ac8c4b0b15b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5a1b4e9af19c9f8ffe394ca80e78db46cb7d87b6e4b518b0af760be47595864c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_EIP158" : {
+    "callOutput3partial_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xdd2546003d7b8a552ee01e2e497db253f532f2728034de1bfa422a3c4dbba5d2",
-                    "mixHash" : "0x4aade4576cd8a2b2899bbbd1d99c1b652d05f5528fc6a12cedfb58d231088e38",
-                    "nonce" : "0xc4b7397ca74a0749",
+                    "hash" : "0xd7b7b5b1a71f2aaeb4d7bf16eb206446ef1cf9962711d364e476a99f50a5c5a7",
+                    "mixHash" : "0x2544cad82b79b55409091499952e7f2f1af8e1c3ab9b29ac3ecbd9476f1762f7",
+                    "nonce" : "0xb34b54f1f92da2b4",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
-                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
+                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a04aade4576cd8a2b2899bbbd1d99c1b652d05f5528fc6a12cedfb58d231088e3888c4b7397ca74a0749f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a02544cad82b79b55409091499952e7f2f1af8e1c3ab9b29ac3ecbd9476f1762f788b34b54f1f92da2b4f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd2546003d7b8a552ee01e2e497db253f532f2728034de1bfa422a3c4dbba5d2",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd7b7b5b1a71f2aaeb4d7bf16eb206446ef1cf9962711d364e476a99f50a5c5a7",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_Frontier" : {
+    "callOutput3partial_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x4adbd8bee39505806328515794e87503511da948ab68799a0e9d4b7e873c8947",
-                    "mixHash" : "0x1f4bcd445980223bf81ca83178db5e7aa980d3b80c899b789c1aa098d2d02874",
-                    "nonce" : "0x77dd32e316c48423",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x75e5a13bdf196acd1fec5f1498858cefca0f0208aa1a9e8afef67ee086de4a36",
+                    "mixHash" : "0x43c2b40a122182ea31ac6c456dc8ae7ceb517619e1a7b53d6a6c3b6e86fcaa9c",
+                    "nonce" : "0x856a346567983b01",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
-                    "stateRoot" : "0xb9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752",
+                    "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
+                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a01f4bcd445980223bf81ca83178db5e7aa980d3b80c899b789c1aa098d2d028748877dd32e316c48423f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a043c2b40a122182ea31ac6c456dc8ae7ceb517619e1a7b53d6a6c3b6e86fcaa9c88856a346567983b01f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,14 +316,15 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4adbd8bee39505806328515794e87503511da948ab68799a0e9d4b7e873c8947",
-        "network" : "Frontier",
+        "lastblockhash" : "0x75e5a13bdf196acd1fec5f1498858cefca0f0208aa1a9e8afef67ee086de4a36",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -320,7 +335,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7627960",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_Homestead" : {
+    "callOutput3partial_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb40d",
-                    "hash" : "0x6b76ea8758c016b3ce70f25ff8eb617f106c310a50d40c48c2e591d924bb2b3d",
-                    "mixHash" : "0xc9689ff5ecb119df3e236e8bbce1b57330f8cbcf30f0afb09d22a18863a6aaef",
-                    "nonce" : "0x9f9df8c72aeb04d1",
+                    "gasUsed" : "0xb6a1",
+                    "hash" : "0x308d787c4dab649667c9cb025971355b69ed0b7181e1a9357b4c5a3cf799b14d",
+                    "mixHash" : "0xdf5e3eb925cb94a9d12e5fd843bf59ea6deaad3859c8c5d1a3443d5a0b3d562b",
+                    "nonce" : "0x10b6850998cca395",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
+                    "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
                     "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0c9689ff5ecb119df3e236e8bbce1b57330f8cbcf30f0afb09d22a18863a6aaef889f9df8c72aeb04d1f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0df5e3eb925cb94a9d12e5fd843bf59ea6deaad3859c8c5d1a3443d5a0b3d562b8810b6850998cca395f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6b76ea8758c016b3ce70f25ff8eb617f106c310a50d40c48c2e591d924bb2b3d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x308d787c4dab649667c9cb025971355b69ed0b7181e1a9357b4c5a3cf799b14d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -478,10 +493,10 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_Metropolis" : {
+    "callOutput3partial_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x92c5c3d0067db9556ed71aa6d75a4d734d0023b59539617e78be99f2b71c61a5",
-                    "mixHash" : "0xe87313b0939e6bba8a49c7a86effe6e337036d5e79ddc17822d652a4cebe6cbb",
-                    "nonce" : "0xd2cb54582e1c4d95",
+                    "gasUsed" : "0x0dbba0",
+                    "hash" : "0x83ab0fb60128648c6ceec87007eea5be6642b33d67b5d33e9359374ce0fad19f",
+                    "mixHash" : "0xc9021303d701bb92ae703428df4ac2f2a9540345c4c5529dd740db42103a6383",
+                    "nonce" : "0x2da9848bf0c808fd",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
-                    "stateRoot" : "0x124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12e",
+                    "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
+                    "stateRoot" : "0xb9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0124bf9344b865486bd77ce412abbca150fe828c667ea768faf7508f3c1abc12ea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0e87313b0939e6bba8a49c7a86effe6e337036d5e79ddc17822d652a4cebe6cbb88d2cb54582e1c4d95f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0c9021303d701bb92ae703428df4ac2f2a9540345c4c5529dd740db42103a6383882da9848bf0c808fdf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92c5c3d0067db9556ed71aa6d75a4d734d0023b59539617e78be99f2b71c61a5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x83ab0fb60128648c6ceec87007eea5be6642b33d67b5d33e9359374ce0fad19f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callOutput3partial_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb40d",
+                    "hash" : "0x34eaf91fb7bcc3df26789c1e1010ae1ddbddd356ddf72500cd5962355e53c95c",
+                    "mixHash" : "0x86e508d84c19756fb3ac9bd17d903ee3f4e16aef3ab9251b3e3f9af22e17cf98",
+                    "nonce" : "0x271ab5aac6f0650b",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
+                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a086e508d84c19756fb3ac9bd17d903ee3f4e16aef3ab9251b3e3f9af22e17cf9888271ab5aac6f0650bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0dbba0",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
+                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x34eaf91fb7bcc3df26789c1e1010ae1ddbddd356ddf72500cd5962355e53c95c",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
index c257250c6..e0d66cd83 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callWithHighValueAndGasOOG_d0g0v0_EIP150" : {
+    "callWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xf49ed570fd55b617cc0b14c5be41607a2c637491e170eb30033c3b9afb6b3caf",
-                    "mixHash" : "0x1699cb60093d72657cd2a451ec24d357dfe5d5dd9f33e026e3791dd892f0481d",
-                    "nonce" : "0x1c772eaf7410f998",
+                    "hash" : "0x50897f86899086c1fe09b17fbaf1d007d5ddc17f3c88e78b5ed29e149a4a5ea6",
+                    "mixHash" : "0x844ddc18ea3c59f9969bff3621613d88e49445dd6c75597d626c30f5ef6884f7",
+                    "nonce" : "0x2609acaaaed42413",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a01699cb60093d72657cd2a451ec24d357dfe5d5dd9f33e026e3791dd892f0481d881c772eaf7410f998f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0844ddc18ea3c59f9969bff3621613d88e49445dd6c75597d626c30f5ef6884f7882609acaaaed42413f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf49ed570fd55b617cc0b14c5be41607a2c637491e170eb30033c3b9afb6b3caf",
-        "network" : "EIP150",
+        "lastblockhash" : "0x50897f86899086c1fe09b17fbaf1d007d5ddc17f3c88e78b5ed29e149a4a5ea6",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
+    "callWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x49b6e18d0afad199e1ed0469e0d02cabdf62a11910bb8ca6882977f01b157cca",
+                    "mixHash" : "0xc62eabe95faa83d07e1057f16a74abb184589dccc6ea0b0464bf3a093a45f9fd",
+                    "nonce" : "0x207525a93f5d7ff9",
+                    "number" : "0x01",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c62eabe95faa83d07e1057f16a74abb184589dccc6ea0b0464bf3a093a45f9fd88207525a93f5d7ff9f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
+                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x49b6e18d0afad199e1ed0469e0d02cabdf62a11910bb8ca6882977f01b157cca",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callWithHighValueAndGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xf3f54b86fae01b3b2917a9fefab9f1fcd3334f705c77ab8003703ab0e196e5ea",
-                    "mixHash" : "0x75b425b96f1a34d91979c727cfb0a6c56ef1e74650fea54571a3290f4db5e293",
-                    "nonce" : "0x6b709f6298df0f85",
+                    "hash" : "0x81ac34ec0bc06635c382a1c50a48f9cb07a8acf5bd5d810a260aa11f812a8f95",
+                    "mixHash" : "0xd7fd076cb0d036c937f5ae4f927b422092e451e3e9958640c9cf2c21a7020acb",
+                    "nonce" : "0x15962bbf1be56bca",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a075b425b96f1a34d91979c727cfb0a6c56ef1e74650fea54571a3290f4db5e293886b709f6298df0f85f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0d7fd076cb0d036c937f5ae4f927b422092e451e3e9958640c9cf2c21a7020acb8815962bbf1be56bcaf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3f54b86fae01b3b2917a9fefab9f1fcd3334f705c77ab8003703ab0e196e5ea",
-        "network" : "EIP158",
+        "lastblockhash" : "0x81ac34ec0bc06635c382a1c50a48f9cb07a8acf5bd5d810a260aa11f812a8f95",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
+    "callWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xececa1e5687a179f7211345fa0682e6249cb90905d020a8156451229debd8ee2",
-                    "mixHash" : "0x88c0f79de13151e3f32ee107a11b80c278aaae1e370408bfb67b6031b84c9f79",
-                    "nonce" : "0xf128ff7de7cf8704",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x9e6cb709ef20ddd1ef636fe9b6fd9026f34f4da3819b08756f8461815c391bb7",
+                    "mixHash" : "0xc41a27eb3eaa9c0f8436c39e46ba456aae1b0b299acb18de54f0eafc1ded6293",
+                    "nonce" : "0x614dfa3b0b4fdafa",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a088c0f79de13151e3f32ee107a11b80c278aaae1e370408bfb67b6031b84c9f7988f128ff7de7cf8704f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0c41a27eb3eaa9c0f8436c39e46ba456aae1b0b299acb18de54f0eafc1ded629388614dfa3b0b4fdafaf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +439,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xececa1e5687a179f7211345fa0682e6249cb90905d020a8156451229debd8ee2",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9e6cb709ef20ddd1ef636fe9b6fd9026f34f4da3819b08756f8461815c391bb7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +497,10 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
+    "callWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xa949326019f0356f05b0e5f86f8b6dbe1ce7b9155d33a8c76fc0009a2bbede72",
-                    "mixHash" : "0x218493f37a79bd7be2430fa2cb93f0b2fb3c37666f2cdc6340a9588e88c01bc0",
-                    "nonce" : "0x16aa174c9a600f7e",
+                    "hash" : "0xf6caf481ffd6b76f4ab178609f8ccc2d22fbe555070f686bff8d6cc110eda74d",
+                    "mixHash" : "0x7d2dbd4b8dcf73954d9b304179f22266865a94247c5b09c50064a02d7b02aff7",
+                    "nonce" : "0x283025446f00e6cc",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0218493f37a79bd7be2430fa2cb93f0b2fb3c37666f2cdc6340a9588e88c01bc08816aa174c9a600f7ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07d2dbd4b8dcf73954d9b304179f22266865a94247c5b09c50064a02d7b02aff788283025446f00e6ccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa949326019f0356f05b0e5f86f8b6dbe1ce7b9155d33a8c76fc0009a2bbede72",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf6caf481ffd6b76f4ab178609f8ccc2d22fbe555070f686bff8d6cc110eda74d",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_d0g0v0_Metropolis" : {
+    "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xd4545fed21fe6a5e96e757aa4506032b9c217a8b9286e52ac3fca2da85b4954a",
-                    "mixHash" : "0xecf71bfc10318ff11ddb0c68f0d6b203bab269dbe41174884aceede52f9f366c",
-                    "nonce" : "0x7b4e6ff6ff2fb951",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0x170947d12679c1787e35d38f5e784e6b234e86dd1e6f63ae956ebf6843439360",
+                    "mixHash" : "0x18c60d88e7eee3996b247fa36ff09d66f583361f55bc182672b0f5992167dca1",
+                    "nonce" : "0x30e0ebd6a0302a53",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0ecf71bfc10318ff11ddb0c68f0d6b203bab269dbe41174884aceede52f9f366c887b4e6ff6ff2fb951f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a018c60d88e7eee3996b247fa36ff09d66f583361f55bc182672b0f5992167dca18830e0ebd6a0302a53f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,27 +679,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4545fed21fe6a5e96e757aa4506032b9c217a8b9286e52ac3fca2da85b4954a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x170947d12679c1787e35d38f5e784e6b234e86dd1e6f63ae956ebf6843439360",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x456391824521c6c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -576,7 +704,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
index 3d9fe584b..0c1b13d64 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput1_d0g0v0_EIP150" : {
+    "callcodeOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xacc5ff140abbedded72e81d7909ef1ff10f50800337d9de1c83edee29df1229f",
-                    "mixHash" : "0xd76b3649a049a098f4eafa1a3d989c5565e838f24951cf75053059011139cd7e",
-                    "nonce" : "0x4d1573696cd28eb5",
+                    "hash" : "0xe54a9593b907c21501ed4dc6d6a1cd8723280af9bde1dd610dafc5e0dbca7d74",
+                    "mixHash" : "0xe78d1df0abb95bd1fa8723f82b77d6f3cd2e7e371cac842596ebae497aa6b16c",
+                    "nonce" : "0xbdcc61f463f3e377",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d76b3649a049a098f4eafa1a3d989c5565e838f24951cf75053059011139cd7e884d1573696cd28eb5c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e78d1df0abb95bd1fa8723f82b77d6f3cd2e7e371cac842596ebae497aa6b16c88bdcc61f463f3e377c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xacc5ff140abbedded72e81d7909ef1ff10f50800337d9de1c83edee29df1229f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe54a9593b907c21501ed4dc6d6a1cd8723280af9bde1dd610dafc5e0dbca7d74",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_EIP158" : {
+    "callcodeOutput1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x95f97985e4df2b644020988a253915477a42f4ca45193cb26479ccdc040d4609",
-                    "mixHash" : "0xc7378cdf7e89d4e95c60ece338a82e30b5753fbd1ac49ffec3be830b0cc421e8",
-                    "nonce" : "0x4e9ac8ad28e2c7a5",
+                    "hash" : "0x753f6d9f38eb82620aa949daa89b3f4566d871dc87151e69e5c638440a94a346",
+                    "mixHash" : "0x0aaaf6149fc951803ab9630caa8cd6069a658227f3c54f7d01e1a765d4e04b2f",
+                    "nonce" : "0x1c77a278a2ce499d",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c7378cdf7e89d4e95c60ece338a82e30b5753fbd1ac49ffec3be830b0cc421e8884e9ac8ad28e2c7a5c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00aaaf6149fc951803ab9630caa8cd6069a658227f3c54f7d01e1a765d4e04b2f881c77a278a2ce499dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95f97985e4df2b644020988a253915477a42f4ca45193cb26479ccdc040d4609",
-        "network" : "EIP158",
+        "lastblockhash" : "0x753f6d9f38eb82620aa949daa89b3f4566d871dc87151e69e5c638440a94a346",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_Frontier" : {
+    "callcodeOutput1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x058386e2aba4c740d4cec2ebd98ecd409ffa16aca1b4f1efab1b2f54713dbab4",
-                    "mixHash" : "0x35bf7b85da0a93f1de3ecdc8a4d56b535a2c9c8844a2b905f6233c71e370f8b5",
-                    "nonce" : "0xdd1d9ab83fcf51d1",
+                    "hash" : "0xa31496c7a5bdaa3cca61ea9cc14fffe428a310be3b282395f516d6224d7eff7c",
+                    "mixHash" : "0x8b1f9156be2fc34ee7278cac8154d830287f7b512a27518bc73c9495ae8b73d6",
+                    "nonce" : "0xac168a71414c036c",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a035bf7b85da0a93f1de3ecdc8a4d56b535a2c9c8844a2b905f6233c71e370f8b588dd1d9ab83fcf51d1c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08b1f9156be2fc34ee7278cac8154d830287f7b512a27518bc73c9495ae8b73d688ac168a71414c036cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x058386e2aba4c740d4cec2ebd98ecd409ffa16aca1b4f1efab1b2f54713dbab4",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa31496c7a5bdaa3cca61ea9cc14fffe428a310be3b282395f516d6224d7eff7c",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_Homestead" : {
+    "callcodeOutput1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3002dceabb5d08b57a8d0ec1aa1ece3f4db7ab8768e9434315d2796a9d82acc8",
-                    "mixHash" : "0xa68e510771184b6589f0bf541767fc21c125f13a45225c0693289c8f3aa13651",
-                    "nonce" : "0x55861b47eb569c2e",
+                    "hash" : "0x11a4ce52987d54d73ee3d4c743674d3a40949066c85ebc159a04c4777cf4982f",
+                    "mixHash" : "0x4a2c5b463b3d9292c69650d461f63f65eb6837fb5c6d303d47dc7eb22806b880",
+                    "nonce" : "0xe835db8666ecde56",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a68e510771184b6589f0bf541767fc21c125f13a45225c0693289c8f3aa136518855861b47eb569c2ec0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04a2c5b463b3d9292c69650d461f63f65eb6837fb5c6d303d47dc7eb22806b88088e835db8666ecde56c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3002dceabb5d08b57a8d0ec1aa1ece3f4db7ab8768e9434315d2796a9d82acc8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x11a4ce52987d54d73ee3d4c743674d3a40949066c85ebc159a04c4777cf4982f",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput1_d0g0v0_Metropolis" : {
+    "callcodeOutput1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x090aac1553174d0cb5510ea064e880227711a2de5c919ff1490ebc1f4cd0d0cf",
-                    "mixHash" : "0xc2f4df5b3a258b86eec1ad9687bde138c4fefd77cf1022548d4a155c787457e9",
-                    "nonce" : "0x928d8279dfcd2bdd",
+                    "hash" : "0xcce26acefb450b805635f832b75e5b74b73dbcbc62c96ce7ae719a52777d0293",
+                    "mixHash" : "0xafc5b9fb972c25dee28028b1c61060114d4266deda0092fff20f279ed17a0c16",
+                    "nonce" : "0x60e4e0942e8be368",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x9e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e28034cc9522420f482eabef008c817e3da4947ae18241a954d419a8fa3a856a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c2f4df5b3a258b86eec1ad9687bde138c4fefd77cf1022548d4a155c787457e988928d8279dfcd2bddc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0afc5b9fb972c25dee28028b1c61060114d4266deda0092fff20f279ed17a0c168860e4e0942e8be368c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x090aac1553174d0cb5510ea064e880227711a2de5c919ff1490ebc1f4cd0d0cf",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcce26acefb450b805635f832b75e5b74b73dbcbc62c96ce7ae719a52777d0293",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x6bcd143650d8772cdb97368952edf1e112abba90d1edb52b2b7ebd4f1e51db8a",
+                    "mixHash" : "0x5e8a59ed075944be33f66e75b42380569e9dd4faaca322f11c5523bade7061ed",
+                    "nonce" : "0x09c932fc0b62285e",
+                    "number" : "0x01",
+                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05e8a59ed075944be33f66e75b42380569e9dd4faaca322f11c5523bade7061ed8809c932fc0b62285ec0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6bcd143650d8772cdb97368952edf1e112abba90d1edb52b2b7ebd4f1e51db8a",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
index 70e2b0b7f..6fca7811f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput2_d0g0v0_EIP150" : {
+    "callcodeOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe2f9211febea7793ae5f7f5c15835a3eac2917844bb83a0e89e1d64328dd31ee",
-                    "mixHash" : "0x32fd7e17ebfcd01e2dd236573252ba797b21a18c81329d3b0ca090f6e7e05519",
-                    "nonce" : "0x72472e9c7bc5c7ff",
+                    "hash" : "0x3b272604b7ae55691ac53d690249f0d0ed204bbb4bdbdcd1ed6405ee54c2185e",
+                    "mixHash" : "0x3d6ace248c63a1649e661abcc369d57be29c66e6d15d841de786b6fe8be92a1d",
+                    "nonce" : "0xcd7f1747706ec033",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a032fd7e17ebfcd01e2dd236573252ba797b21a18c81329d3b0ca090f6e7e055198872472e9c7bc5c7ffc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03d6ace248c63a1649e661abcc369d57be29c66e6d15d841de786b6fe8be92a1d88cd7f1747706ec033c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe2f9211febea7793ae5f7f5c15835a3eac2917844bb83a0e89e1d64328dd31ee",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3b272604b7ae55691ac53d690249f0d0ed204bbb4bdbdcd1ed6405ee54c2185e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_EIP158" : {
+    "callcodeOutput2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2c1fd023c06e8b03f204d7d4ae247dfc5e038df876c4b5409e8c40025e9ecf6c",
-                    "mixHash" : "0xc7b6c275b6b08b1e55e6b7d407282f277c112c0fac6810f1af215dd17edb0179",
-                    "nonce" : "0x9b75df1bbfdb938c",
+                    "hash" : "0xd3498a0ec709002f0f746cfee25d00c44f7b3ec258ee9dd1a19931ae2280def9",
+                    "mixHash" : "0x94f0c3f4fb179f250f54d18ad59f0e462625cef1f1c0e49b24fdeee665f46b8c",
+                    "nonce" : "0xba34bf4368ed4438",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0c7b6c275b6b08b1e55e6b7d407282f277c112c0fac6810f1af215dd17edb0179889b75df1bbfdb938cc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a094f0c3f4fb179f250f54d18ad59f0e462625cef1f1c0e49b24fdeee665f46b8c88ba34bf4368ed4438c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c1fd023c06e8b03f204d7d4ae247dfc5e038df876c4b5409e8c40025e9ecf6c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd3498a0ec709002f0f746cfee25d00c44f7b3ec258ee9dd1a19931ae2280def9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Frontier" : {
+    "callcodeOutput2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf8831914002e0c8cd0907b0f5053c68978ddf56329ba4b80fa67d17b98cf3fcf",
-                    "mixHash" : "0xb7ccb10fccef51856e89a6033846380ca4583c284a12d0ae18a767176249c15e",
-                    "nonce" : "0xd517041fdb7beac3",
+                    "hash" : "0xdbed07bd809d0681077ac7d71f31e87bf1aeb45640976d0f42edcfe93292b0ad",
+                    "mixHash" : "0xa7d0a207613f249e7680120eb1cb050a46a881527759d04968445fc4d7ee6046",
+                    "nonce" : "0x165908c307474825",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b7ccb10fccef51856e89a6033846380ca4583c284a12d0ae18a767176249c15e88d517041fdb7beac3c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a7d0a207613f249e7680120eb1cb050a46a881527759d04968445fc4d7ee604688165908c307474825c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf8831914002e0c8cd0907b0f5053c68978ddf56329ba4b80fa67d17b98cf3fcf",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdbed07bd809d0681077ac7d71f31e87bf1aeb45640976d0f42edcfe93292b0ad",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Homestead" : {
+    "callcodeOutput2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x452a15e25bf1dff68002192944441b5debf0f32ba926786af67553eb6a46701a",
-                    "mixHash" : "0x94f9c64d2751a32b1a48cf5c158f3ff0e25cb990f1641bbf4c5183b4bb12aa19",
-                    "nonce" : "0xf77ecaaceb56d5b3",
+                    "hash" : "0x663bd8be21ed5768fcbd102c7c925ccaadcbcea3e18d276a48ce282852cd7d6a",
+                    "mixHash" : "0x68a43a234ee10dcdc0017eda0e764d05af7f756e5a9390c7b8f429f2074a282c",
+                    "nonce" : "0x1f5642afae130997",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a094f9c64d2751a32b1a48cf5c158f3ff0e25cb990f1641bbf4c5183b4bb12aa1988f77ecaaceb56d5b3c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a068a43a234ee10dcdc0017eda0e764d05af7f756e5a9390c7b8f429f2074a282c881f5642afae130997c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x452a15e25bf1dff68002192944441b5debf0f32ba926786af67553eb6a46701a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x663bd8be21ed5768fcbd102c7c925ccaadcbcea3e18d276a48ce282852cd7d6a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Metropolis" : {
+    "callcodeOutput2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc76102ac76f88541c8b51687703d3cca5565914c999ec084a8075d07f5133e12",
-                    "mixHash" : "0x5b62a69b6e02ed975a7dce40d1b830f9ef6751c151914d01a2babf6ca1249287",
-                    "nonce" : "0x1416e9b66bf9968e",
+                    "hash" : "0x031ad483916c8afbafd48cd7b83057b92fa4fdb3635744783c49837c2a69e91f",
+                    "mixHash" : "0x9db674bf6a2cfc30b0e052af27005053784a3b7fc5d87a1e69bc58a72ffe6486",
+                    "nonce" : "0xdf8f18183c50951b",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff417a8ef4d2b03069a9974cab753dac59b0a37ce9e236cd4d8018e81d0cb7f6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b62a69b6e02ed975a7dce40d1b830f9ef6751c151914d01a2babf6ca1249287881416e9b66bf9968ec0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09db674bf6a2cfc30b0e052af27005053784a3b7fc5d87a1e69bc58a72ffe648688df8f18183c50951bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc76102ac76f88541c8b51687703d3cca5565914c999ec084a8075d07f5133e12",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x031ad483916c8afbafd48cd7b83057b92fa4fdb3635744783c49837c2a69e91f",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xb5d19afdb7681aa4311a943696b4eb6a891b31a405acf256b26a8d74a77b5668",
+                    "mixHash" : "0x0773f5e37db8e98892ae08c26e64207a64946d1f946ab168075a9c209f87e11f",
+                    "nonce" : "0x9c8355371059e17a",
+                    "number" : "0x01",
+                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00773f5e37db8e98892ae08c26e64207a64946d1f946ab168075a9c209f87e11f889c8355371059e17ac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb5d19afdb7681aa4311a943696b4eb6a891b31a405acf256b26a8d74a77b5668",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
index 302e39fdf..299903815 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput3Fail_d0g0v0_EIP150" : {
+    "callcodeOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa3af699e2910ca251601e98b6767f0beabd6409315e64731bfcbb8722bc3a271",
-                    "mixHash" : "0xb095950e2b37888250ac6eff7dfb73adbbd50192a9100ebc34a3c4652097726e",
-                    "nonce" : "0x20f50d1e18334b27",
+                    "hash" : "0x4413785072453ff3db473323d402aa904c11950ad4a32240d2c50055665deeb7",
+                    "mixHash" : "0x6fc662af159d4add378c6d66d70920e1e629d7bef84679267ef82c4578386656",
+                    "nonce" : "0x6ffb05671c53945a",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b095950e2b37888250ac6eff7dfb73adbbd50192a9100ebc34a3c4652097726e8820f50d1e18334b27c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06fc662af159d4add378c6d66d70920e1e629d7bef84679267ef82c4578386656886ffb05671c53945ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3af699e2910ca251601e98b6767f0beabd6409315e64731bfcbb8722bc3a271",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4413785072453ff3db473323d402aa904c11950ad4a32240d2c50055665deeb7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_EIP158" : {
+    "callcodeOutput3Fail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8d57883012b82f3fca5b2e50f9ceb418f69979872ce4bc16185879143c6ca8ce",
-                    "mixHash" : "0x9d33f7a4a3c604a2f151defd55d6d931bb19b30dbde0416781c92696a30b5b50",
-                    "nonce" : "0xb13a3c1bdab1a910",
+                    "hash" : "0x5091f0414ca4ad1d37498e3037573ca96f6cec829123cfa787981f74d96a1ca9",
+                    "mixHash" : "0x784c3c615d0db89593c59de5a204442d366207f44e9830de5cb44fac567206a7",
+                    "nonce" : "0xc88deed46c048590",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09d33f7a4a3c604a2f151defd55d6d931bb19b30dbde0416781c92696a30b5b5088b13a3c1bdab1a910c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0784c3c615d0db89593c59de5a204442d366207f44e9830de5cb44fac567206a788c88deed46c048590c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d57883012b82f3fca5b2e50f9ceb418f69979872ce4bc16185879143c6ca8ce",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5091f0414ca4ad1d37498e3037573ca96f6cec829123cfa787981f74d96a1ca9",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_Frontier" : {
+    "callcodeOutput3Fail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5c98bb8caf86e2cf4f21249cda346325c55e19966e5c68147103138535ce0afa",
-                    "mixHash" : "0x22ae81c0a79798c894f879a08fd3a5ae587e1a8852215b675d86037518339af6",
-                    "nonce" : "0x3c1170c1e4622a44",
+                    "hash" : "0xb4f621f334e412c277f6e46688e31efe6ccb76432bdc1eb11840c7aeef5f6d07",
+                    "mixHash" : "0x5f37e2fda359b12c1379aa34c7bf25ac1c506ad1aca278fb72643c7429ea6996",
+                    "nonce" : "0x48267c50dada2fb4",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a022ae81c0a79798c894f879a08fd3a5ae587e1a8852215b675d86037518339af6883c1170c1e4622a44c0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05f37e2fda359b12c1379aa34c7bf25ac1c506ad1aca278fb72643c7429ea69968848267c50dada2fb4c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c98bb8caf86e2cf4f21249cda346325c55e19966e5c68147103138535ce0afa",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb4f621f334e412c277f6e46688e31efe6ccb76432bdc1eb11840c7aeef5f6d07",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_Homestead" : {
+    "callcodeOutput3Fail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x34da1fc682ef63eac2ebf5e14153e1e33fe0ce72d801ed3551fda5bd6f0d5641",
-                    "mixHash" : "0xcb8d4401d71dc53f20948fb59b8baf5ae0d42231e9111169b3a5bec82aa4839f",
-                    "nonce" : "0x84b58f1940d39d8b",
+                    "hash" : "0x58b951c810f52883c846956ab4eb4ea1a6d28a46d6b4ce33708a006d8f98bc45",
+                    "mixHash" : "0xbb7810c5f1ae3f45b02c4c544542164144667544c27bc439a431b86af767ba90",
+                    "nonce" : "0x134f5444e4a1f1e6",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cb8d4401d71dc53f20948fb59b8baf5ae0d42231e9111169b3a5bec82aa4839f8884b58f1940d39d8bc0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bb7810c5f1ae3f45b02c4c544542164144667544c27bc439a431b86af767ba9088134f5444e4a1f1e6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34da1fc682ef63eac2ebf5e14153e1e33fe0ce72d801ed3551fda5bd6f0d5641",
-        "network" : "Homestead",
+        "lastblockhash" : "0x58b951c810f52883c846956ab4eb4ea1a6d28a46d6b4ce33708a006d8f98bc45",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput3Fail_d0g0v0_Metropolis" : {
+    "callcodeOutput3Fail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x443f22217644cf8b854c712ab53c19913e7ecd0c32260a15397cfba5275ca2cb",
-                    "mixHash" : "0x2ce1fd6e9e3f0bb74314e8207a4a834822a35706ed08b3adc98f0c5f4f43393d",
-                    "nonce" : "0xb0394fcc8a8fd95a",
+                    "hash" : "0xf1d2873adaa26eb700eacfb6a880f4fcfac413dbf376c37a955c4328962c5d90",
+                    "mixHash" : "0x1a82379a2a9cd8585b29fab6df766f5284748a7bdb9b16ce8a75e44050c443e8",
+                    "nonce" : "0xabe16d7f436b28e0",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xe018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e018f0f67f8d6ddfeb64c80bdadfdee8d1ac18b65ebf03eec5b184fcb179a038a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02ce1fd6e9e3f0bb74314e8207a4a834822a35706ed08b3adc98f0c5f4f43393d88b0394fcc8a8fd95ac0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01a82379a2a9cd8585b29fab6df766f5284748a7bdb9b16ce8a75e44050c443e888abe16d7f436b28e0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x443f22217644cf8b854c712ab53c19913e7ecd0c32260a15397cfba5275ca2cb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf1d2873adaa26eb700eacfb6a880f4fcfac413dbf376c37a955c4328962c5d90",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3Fail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xbc8029d66974dc5e232bc3cdca395eaf7bb00bd087256ba7a14ed23c410c3e53",
+                    "mixHash" : "0x07b2bd685c8fbb6d1070438bdf02d34079bdff31240929060b0d23ddfbff6eb7",
+                    "nonce" : "0x81561abf3c7fdd06",
+                    "number" : "0x01",
+                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007b2bd685c8fbb6d1070438bdf02d34079bdff31240929060b0d23ddfbff6eb78881561abf3c7fdd06c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbc8029d66974dc5e232bc3cdca395eaf7bb00bd087256ba7a14ed23c410c3e53",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
index fed1edaf5..956c6f7a6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput3_d0g0v0_EIP150" : {
+    "callcodeOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb551991709a1192fef3cd2be3fea5439bfb450982a256024387c6da6320d446c",
-                    "mixHash" : "0x2142cc10075c750d31edd53a3f8975a81fc51a67f914799aae1bac3c4fe5133f",
-                    "nonce" : "0x515a06fc05775742",
+                    "hash" : "0x40e907e9e711c1db92751b28133c22b32e2174b39c5d9e05bc648b3df9915243",
+                    "mixHash" : "0x0946f763374057e29ceaee98194b1262d32c552986a1bfb52af944c87b9c61b3",
+                    "nonce" : "0xd03a7cf42bb1abb7",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02142cc10075c750d31edd53a3f8975a81fc51a67f914799aae1bac3c4fe5133f88515a06fc05775742c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00946f763374057e29ceaee98194b1262d32c552986a1bfb52af944c87b9c61b388d03a7cf42bb1abb7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb551991709a1192fef3cd2be3fea5439bfb450982a256024387c6da6320d446c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x40e907e9e711c1db92751b28133c22b32e2174b39c5d9e05bc648b3df9915243",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_EIP158" : {
+    "callcodeOutput3_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0cb333cdb233e6856864908e4c6e560c11cf9567a3c44ecb0fd3e9eb62a01311",
-                    "mixHash" : "0xf16d00d8163b37d57973f121703cd6b12e0bcca8a649ba2aeb813f239223ff4b",
-                    "nonce" : "0x1bbcc4c685e1833a",
+                    "hash" : "0xe730fe2894b6a10b19c11fb4727487b049725a2a0bb15efa2a759786548cda82",
+                    "mixHash" : "0x47f0bf794d089db74e29d337f6634014b3da9dbc9bc0b658da51afb61415c540",
+                    "nonce" : "0x4dabdd8e08608f79",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f16d00d8163b37d57973f121703cd6b12e0bcca8a649ba2aeb813f239223ff4b881bbcc4c685e1833ac0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047f0bf794d089db74e29d337f6634014b3da9dbc9bc0b658da51afb61415c540884dabdd8e08608f79c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0cb333cdb233e6856864908e4c6e560c11cf9567a3c44ecb0fd3e9eb62a01311",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe730fe2894b6a10b19c11fb4727487b049725a2a0bb15efa2a759786548cda82",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Frontier" : {
+    "callcodeOutput3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xaf92fee11239d61de56cc1811778e8831821853c21fd4784409c546b0e2cb44c",
-                    "mixHash" : "0x864556ad64bbcf2f51c41b59733ff31912460e2c10f2131b024d421c63475ef7",
-                    "nonce" : "0x0be3e6f9462dbd46",
+                    "hash" : "0x70133023624df7b0e91f4dd52a0dc8802b86752851adb53d11427e937da78b30",
+                    "mixHash" : "0x3fc2de2d01f1dfbc41e2590c8b25d3e6bab599f392ed2c9f90afdc9d9b39ce6c",
+                    "nonce" : "0x01addd5113bd8e57",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0864556ad64bbcf2f51c41b59733ff31912460e2c10f2131b024d421c63475ef7880be3e6f9462dbd46c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03fc2de2d01f1dfbc41e2590c8b25d3e6bab599f392ed2c9f90afdc9d9b39ce6c8801addd5113bd8e57c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf92fee11239d61de56cc1811778e8831821853c21fd4784409c546b0e2cb44c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x70133023624df7b0e91f4dd52a0dc8802b86752851adb53d11427e937da78b30",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Homestead" : {
+    "callcodeOutput3_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xb85f6e96479446677a09143e8ce1aee39c88ece0535f21c2c28698f74495bf4d",
-                    "mixHash" : "0x65593bb6567561ca72c6770a4876594bd24c16afffd40676c909d2ac2e5aa15a",
-                    "nonce" : "0x1f6884e0cb87558a",
+                    "hash" : "0xa8c88b8d2b9f75329d78167ae17e9718ab08ada3aa2b8c6c45160ebbcf23c7e4",
+                    "mixHash" : "0x7a0acb52664dbfcaf6b1b04770858f56f329dc86671f4b4e1cef735f29ccfc53",
+                    "nonce" : "0x0f3cb7786b0afced",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a065593bb6567561ca72c6770a4876594bd24c16afffd40676c909d2ac2e5aa15a881f6884e0cb87558ac0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07a0acb52664dbfcaf6b1b04770858f56f329dc86671f4b4e1cef735f29ccfc53880f3cb7786b0afcedc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb85f6e96479446677a09143e8ce1aee39c88ece0535f21c2c28698f74495bf4d",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa8c88b8d2b9f75329d78167ae17e9718ab08ada3aa2b8c6c45160ebbcf23c7e4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Metropolis" : {
+    "callcodeOutput3_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x26e714c30e728e4535481174cb556d980142b2d77ad25bb20ad0cdf5118870dc",
-                    "mixHash" : "0x6d5ccc314a5dfda6d44081ef1aa45f452a15c69284053ab32ea458c3f0d00a77",
-                    "nonce" : "0x89a48d9a26f98912",
+                    "hash" : "0x03274acf704659ab0077c47623ee582e376ef4cab52ade3c3d6688242f9a7600",
+                    "mixHash" : "0x53b5e2df5c73199b6e88eaedde18e08732d10ab47eeff235280cdcf086bb0bf2",
+                    "nonce" : "0x5b862575b01745f1",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaa",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c632a077005151b4a1a2996db0e28bec0590a4753a160178413620db83feaaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06d5ccc314a5dfda6d44081ef1aa45f452a15c69284053ab32ea458c3f0d00a778889a48d9a26f98912c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a053b5e2df5c73199b6e88eaedde18e08732d10ab47eeff235280cdcf086bb0bf2885b862575b01745f1c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26e714c30e728e4535481174cb556d980142b2d77ad25bb20ad0cdf5118870dc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x03274acf704659ab0077c47623ee582e376ef4cab52ade3c3d6688242f9a7600",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x3e9328403598cd55359b01c0429513d57f5b2ecbbf992e2a7b84377ef1c007c0",
+                    "mixHash" : "0x515bc8194c5079a0e6ba5377638071d46b1f3670d461e60f246f859638b3089f",
+                    "nonce" : "0x779c86184642d18d",
+                    "number" : "0x01",
+                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0515bc8194c5079a0e6ba5377638071d46b1f3670d461e60f246f859638b3089f88779c86184642d18dc0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3e9328403598cd55359b01c0429513d57f5b2ecbbf992e2a7b84377ef1c007c0",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
index 5e9459e29..56f736d26 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput3partialFail_d0g0v0_EIP150" : {
+    "callcodeOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x72c6b2b99aea62b0e5d8702421f7850457996afe1dac63b2562003e784482ed3",
-                    "mixHash" : "0x9a3cb8f94f5fabc153a908ab244cf17561716dff8df147238b64995272229ff7",
-                    "nonce" : "0xaa0213cc8a3fbafd",
+                    "hash" : "0x892501816a13d296d611e325dffa39073400fbfa2a7091a029f28732fea11b23",
+                    "mixHash" : "0xf2d5acf9f70287967255c7654f48c1a8904af6d9c43b9d5f3744720475cf2692",
+                    "nonce" : "0xf6b3249ee4d530e2",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09a3cb8f94f5fabc153a908ab244cf17561716dff8df147238b64995272229ff788aa0213cc8a3fbafdc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f2d5acf9f70287967255c7654f48c1a8904af6d9c43b9d5f3744720475cf269288f6b3249ee4d530e2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72c6b2b99aea62b0e5d8702421f7850457996afe1dac63b2562003e784482ed3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x892501816a13d296d611e325dffa39073400fbfa2a7091a029f28732fea11b23",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_EIP158" : {
+    "callcodeOutput3partialFail_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x45ce3b0dbd2c3c7e3dcb54483393c2208fd4e4626f3e0fd198f356ae034f0923",
-                    "mixHash" : "0x69be892a042241bd07ea7dda31e35cb30bf3fca8eb10d34a92a6528651716f08",
-                    "nonce" : "0xe7b5b377ddd28ed2",
+                    "hash" : "0xc9bd4fff339cde7e75c043d5c4fbd90f83390961bbd01ea7a526b58ff8735ef6",
+                    "mixHash" : "0xd3e897c1ac80353c026e26fb812da1e785bf4a5bd9a707c61f15a5b5113410b2",
+                    "nonce" : "0xcd7d52e61afe3a4e",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a069be892a042241bd07ea7dda31e35cb30bf3fca8eb10d34a92a6528651716f0888e7b5b377ddd28ed2c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d3e897c1ac80353c026e26fb812da1e785bf4a5bd9a707c61f15a5b5113410b288cd7d52e61afe3a4ec0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x45ce3b0dbd2c3c7e3dcb54483393c2208fd4e4626f3e0fd198f356ae034f0923",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc9bd4fff339cde7e75c043d5c4fbd90f83390961bbd01ea7a526b58ff8735ef6",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_Frontier" : {
+    "callcodeOutput3partialFail_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0272a81f5884a4b957729f79ba8bf9f481e68c2d0b24c2a0017cd89989c4556c",
-                    "mixHash" : "0xfabd94dfccb589241e184690ecb78a1c79727eb84a25fdd79cf7004e10033d23",
-                    "nonce" : "0xe419377082012efb",
+                    "hash" : "0x5cb015a1f39a664014e66968105ccede2d554283b4906fb5d32c94f91d197493",
+                    "mixHash" : "0x68c3fe2be72b9fc9c483d4352cd5731492aee28bac487c6e6eb79069c614be7b",
+                    "nonce" : "0x698bca1a4647967a",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fabd94dfccb589241e184690ecb78a1c79727eb84a25fdd79cf7004e10033d2388e419377082012efbc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a068c3fe2be72b9fc9c483d4352cd5731492aee28bac487c6e6eb79069c614be7b88698bca1a4647967ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0272a81f5884a4b957729f79ba8bf9f481e68c2d0b24c2a0017cd89989c4556c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5cb015a1f39a664014e66968105ccede2d554283b4906fb5d32c94f91d197493",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_Homestead" : {
+    "callcodeOutput3partialFail_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf3dad3d6977b76563fa1d5ab974576230f32e7cd2d10f5974ac9d510e715cb25",
-                    "mixHash" : "0x312262b3ec0c33790e3cb6bd35bf6fcba66a9a8250768a2b30a6dbe49eac0fce",
-                    "nonce" : "0x5590ce7e1948ad07",
+                    "hash" : "0x9650d9e36b74cbddb8a2b0863dae5c2955629e4c2071c69d8e3146fde97b13b3",
+                    "mixHash" : "0x3c2c35c41e967311cbdb652912104f12a5ff3540799c220edab40df20f5ab523",
+                    "nonce" : "0xaa76001818ac7eb0",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0312262b3ec0c33790e3cb6bd35bf6fcba66a9a8250768a2b30a6dbe49eac0fce885590ce7e1948ad07c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03c2c35c41e967311cbdb652912104f12a5ff3540799c220edab40df20f5ab52388aa76001818ac7eb0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3dad3d6977b76563fa1d5ab974576230f32e7cd2d10f5974ac9d510e715cb25",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9650d9e36b74cbddb8a2b0863dae5c2955629e4c2071c69d8e3146fde97b13b3",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput3partialFail_d0g0v0_Metropolis" : {
+    "callcodeOutput3partialFail_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x7c408188bfcdc574d81d40c781ba07f61855f6fcc14cee4a1d1302b7ee3fc79e",
-                    "mixHash" : "0x77613a04a4f136839b93feb7bd7ea8c7993c10ae0dd90b14a317dbef3cf86fa2",
-                    "nonce" : "0x145c566428af92cc",
+                    "hash" : "0xc37012a0a9d76549f5604d71fdcc4cede92bccefa05f54cd4308b7ac4b0cdd22",
+                    "mixHash" : "0xd5fbdc07885e35d38d81f02182f3a52840971c9298c57ecb3f80e272678e4407",
+                    "nonce" : "0x451a5d34ac114162",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x2c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1e",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c752eb118b411cd895463cd73f74e0ca6a978594b61b3f0ce8e47add21fdb1ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a077613a04a4f136839b93feb7bd7ea8c7993c10ae0dd90b14a317dbef3cf86fa288145c566428af92ccc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d5fbdc07885e35d38d81f02182f3a52840971c9298c57ecb3f80e272678e440788451a5d34ac114162c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c408188bfcdc574d81d40c781ba07f61855f6fcc14cee4a1d1302b7ee3fc79e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc37012a0a9d76549f5604d71fdcc4cede92bccefa05f54cd4308b7ac4b0cdd22",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x016001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3partialFail_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xf748763180fc70f8cefd7a5456cdc9fd3ce0c30f7be96a6c5068b362cc326872",
+                    "mixHash" : "0x4ca396c61c6990f251366063812e73a38351bb3ae4cc9a3a9fdbff398d502e0c",
+                    "nonce" : "0x45eeac8aad7e9ae3",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04ca396c61c6990f251366063812e73a38351bb3ae4cc9a3a9fdbff398d502e0c8845eeac8aad7e9ae3c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf748763180fc70f8cefd7a5456cdc9fd3ce0c30f7be96a6c5068b362cc326872",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
index aee594274..2faf5fa9f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput3partial_d0g0v0_EIP150" : {
+    "callcodeOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5397f0995a71c9383a2b17d48718ec7b5bb8ceecb990f0b05ae6eec73fc615fa",
-                    "mixHash" : "0x1ac2a75f9adca2ef826741c2763626500ac42e3ce0fb9b01bbc53f8a53c3d34d",
-                    "nonce" : "0x296ace3b00cc5c6a",
+                    "hash" : "0xe311a96a57ad27fbb679efb25c6a1d5c80e7c6baff394b42cfd25fbb3f6f7dd5",
+                    "mixHash" : "0xf67d3cf3d4963077b66d93a3e55fd6b06020de2022d5f55565c7ec76c0eb5672",
+                    "nonce" : "0xb92121861c54dba0",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01ac2a75f9adca2ef826741c2763626500ac42e3ce0fb9b01bbc53f8a53c3d34d88296ace3b00cc5c6ac0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f67d3cf3d4963077b66d93a3e55fd6b06020de2022d5f55565c7ec76c0eb567288b92121861c54dba0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5397f0995a71c9383a2b17d48718ec7b5bb8ceecb990f0b05ae6eec73fc615fa",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe311a96a57ad27fbb679efb25c6a1d5c80e7c6baff394b42cfd25fbb3f6f7dd5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_EIP158" : {
+    "callcodeOutput3partial_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9e85976b2ca7d4c7f3f644bb891b7ec9f7ee85394ba56fe52efdcee6cc16a7d7",
-                    "mixHash" : "0x819e822adff9d71d965fdac3d5293c8203c9b375c1dba4e2ef76d72e3eb81525",
-                    "nonce" : "0x0d392ec51393750c",
+                    "hash" : "0xf38c9594aa91f3aed8a0321dbf8d6a3b80f9bf19ab208b2f24f304dd11a7d4da",
+                    "mixHash" : "0x2005cbfca0aa8be477b4de28c1e9ffcb7737c845a4d97dd8013bd95330288281",
+                    "nonce" : "0xff6d6e815c36b1ab",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0819e822adff9d71d965fdac3d5293c8203c9b375c1dba4e2ef76d72e3eb81525880d392ec51393750cc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02005cbfca0aa8be477b4de28c1e9ffcb7737c845a4d97dd8013bd9533028828188ff6d6e815c36b1abc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -159,9 +166,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e85976b2ca7d4c7f3f644bb891b7ec9f7ee85394ba56fe52efdcee6cc16a7d7",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf38c9594aa91f3aed8a0321dbf8d6a3b80f9bf19ab208b2f24f304dd11a7d4da",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
@@ -215,10 +229,10 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_Frontier" : {
+    "callcodeOutput3partial_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -230,9 +244,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xfd36f0d9433016ac60ef6d3fa4806d962232111580642e177780044507e0330d",
-                    "mixHash" : "0xe1bde2bc7ebfda2fcfbf0dfe3f66bc4635cd569f7192ff716a3c51a6e3c49d1a",
-                    "nonce" : "0x4dc69a878a124b55",
+                    "hash" : "0x0d2dc11b082fdd8d6d95385f88e9d06cc36d1ed94108d3b8d1183a87eb6118d4",
+                    "mixHash" : "0xab84774fd7250a9ff571cc2cc70640cb03c38611d0e7953c282287ae402c5cb7",
+                    "nonce" : "0x70b6abe995220fd2",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -241,7 +255,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e1bde2bc7ebfda2fcfbf0dfe3f66bc4635cd569f7192ff716a3c51a6e3c49d1a884dc69a878a124b55c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ab84774fd7250a9ff571cc2cc70640cb03c38611d0e7953c282287ae402c5cb78870b6abe995220fd2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -267,8 +281,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd36f0d9433016ac60ef6d3fa4806d962232111580642e177780044507e0330d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0d2dc11b082fdd8d6d95385f88e9d06cc36d1ed94108d3b8d1183a87eb6118d4",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -323,10 +337,10 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_Homestead" : {
+    "callcodeOutput3partial_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +352,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3a1769adc1bdc026f592807602c83b34fec010629af1abd074170df19fbcbfc4",
-                    "mixHash" : "0x6609220a63658e09874b0ad6e4410b673d744babac01b7fd27f8f5a86db6f74e",
-                    "nonce" : "0x39e62a02a7b607ac",
+                    "hash" : "0x037fa5c381928211358f81c4c977680ca97f32a8526087d9c90b790d83485dc7",
+                    "mixHash" : "0x052af000fb14b6fea813b4ef81207af041eb2fffcd64b40689602fd076a7625c",
+                    "nonce" : "0xa002e08907263e30",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -349,7 +363,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06609220a63658e09874b0ad6e4410b673d744babac01b7fd27f8f5a86db6f74e8839e62a02a7b607acc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0052af000fb14b6fea813b4ef81207af041eb2fffcd64b40689602fd076a7625c88a002e08907263e30c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -375,8 +389,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a1769adc1bdc026f592807602c83b34fec010629af1abd074170df19fbcbfc4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x037fa5c381928211358f81c4c977680ca97f32a8526087d9c90b790d83485dc7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -431,10 +445,10 @@
             }
         }
     },
-    "callcodeOutput3partial_d0g0v0_Metropolis" : {
+    "callcodeOutput3partial_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -446,18 +460,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa08897de8ede14d221a506b4812ccd28a2a6dd94ebad1f5ecedb7eea009d0155",
-                    "mixHash" : "0xbf3a9c02f8c511402f2817eea7d0c7a9a65d42e01d53e138018f5b797a54ac34",
-                    "nonce" : "0x48c8fc50213132e4",
+                    "hash" : "0x6057d8da323180d3135c5d681485672ab027876f15c59db20e3cb6467a2659a6",
+                    "mixHash" : "0x7d6f9dbcb5ddff39b2f4eef9237531bedaa5f2053d18e1f8b5d2f815b9b70802",
+                    "nonce" : "0x9339c80b307a7d6d",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba65acf2cc9031194c1597d580eddafa3e727fed8767e750b330abae362b6912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bf3a9c02f8c511402f2817eea7d0c7a9a65d42e01d53e138018f5b797a54ac348848c8fc50213132e4c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07d6f9dbcb5ddff39b2f4eef9237531bedaa5f2053d18e1f8b5d2f815b9b70802889339c80b307a7d6dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -483,16 +497,117 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa08897de8ede14d221a506b4812ccd28a2a6dd94ebad1f5ecedb7eea009d0155",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6057d8da323180d3135c5d681485672ab027876f15c59db20e3cb6467a2659a6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3partial_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x4a77e7821f7f43cb479b0b55e30a99bed8d75ab4f9baf022ebe4444c67a85c77",
+                    "mixHash" : "0x3c396dc85fcc482714c76f99473167d1ccf7a94b62aae323a0bd8ba02dbecb62",
+                    "nonce" : "0x93b5adce3bea617a",
+                    "number" : "0x01",
+                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a03c396dc85fcc482714c76f99473167d1ccf7a94b62aae323a0bd8ba02dbecb628893b5adce3bea617ac0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a77e7821f7f43cb479b0b55e30a99bed8d75ab4f9baf022ebe4444c67a85c77",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
index b957664c0..c97b3d434 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP150" : {
+    "callcodeWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0xdcfc3c630613ffe919bd05b7e1cc03971c19681c94bb4439bd33e6c6f232e765",
-                    "mixHash" : "0x54e86c274a44bdcf909de4291dedc2af861c4c704ce86fb92152387201bc804e",
-                    "nonce" : "0x0bdab3134fe732f6",
+                    "hash" : "0xe9162b77375741e59478f75430bbbb396d7bf3efecf5aa39a194b2941707751e",
+                    "mixHash" : "0xb7c193833c873803a24f198b781a154ffe2c5958eea62cb3b96668bda91e3900",
+                    "nonce" : "0x4be0479e673a99cc",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a054e86c274a44bdcf909de4291dedc2af861c4c704ce86fb92152387201bc804e880bdab3134fe732f6f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0b7c193833c873803a24f198b781a154ffe2c5958eea62cb3b96668bda91e3900884be0479e673a99ccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcfc3c630613ffe919bd05b7e1cc03971c19681c94bb4439bd33e6c6f232e765",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe9162b77375741e59478f75430bbbb396d7bf3efecf5aa39a194b2941707751e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
+    "callcodeWithHighValueAndGasOOG_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x47e159edf0ddbedf97003aa4b1c8486bc01435a2dca4d6d07f3b3c92b8ff6cc7",
+                    "mixHash" : "0x50ffa0b58fe56deb12931bc6533c4fa0dedebc26e09958cd9691354f302c6e96",
+                    "nonce" : "0xbd4e1a72315fa518",
+                    "number" : "0x01",
+                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
+                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a050ffa0b58fe56deb12931bc6533c4fa0dedebc26e09958cd9691354f302c6e9688bd4e1a72315fa518f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
+                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x47e159edf0ddbedf97003aa4b1c8486bc01435a2dca4d6d07f3b3c92b8ff6cc7",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f149",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7618817",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x934d27b53481612c663af327cc8b559c925baa60be3ee0d3a5ac3017a8bfe0b6",
-                    "mixHash" : "0x307e8659d90f737aa8c48320da0d295788fee6f5095f6052d2bdf17c4fc94576",
-                    "nonce" : "0xfd2418f43bb10ddd",
+                    "hash" : "0x65dd213c0bad55fd8dfad9b2d43533f03351b6dcc8d3d018d236ede8e98619ee",
+                    "mixHash" : "0x3e03dc44d1be8133665b15920311f360592ed0eb02270915ef11ca7defeced57",
+                    "nonce" : "0xa3af7a1b8158bc59",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0307e8659d90f737aa8c48320da0d295788fee6f5095f6052d2bdf17c4fc9457688fd2418f43bb10dddf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a03e03dc44d1be8133665b15920311f360592ed0eb02270915ef11ca7defeced5788a3af7a1b8158bc59f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x934d27b53481612c663af327cc8b559c925baa60be3ee0d3a5ac3017a8bfe0b6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x65dd213c0bad55fd8dfad9b2d43533f03351b6dcc8d3d018d236ede8e98619ee",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
+    "callcodeWithHighValueAndGasOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xfa8269d141506e043f3bb95fc0a089939d5862f1e980336b3205e3aec8eeb6ab",
-                    "mixHash" : "0xa295711dcd48da74f13849de9807c37e637402b1e3c01eac46134e52996e87e6",
-                    "nonce" : "0x284ea218e2f982f9",
+                    "gasUsed" : "0xf149",
+                    "hash" : "0x8422c09e13f47d089db6701a82c4694ad0a180696c82f784f2bccea13c0551a9",
+                    "mixHash" : "0x97f320c4ea66f8c961157d99f54981e28592ab00226ebaa436e58c6aa8e2f7e0",
+                    "nonce" : "0xb2f8412d980383bd",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
+                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
+                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a295711dcd48da74f13849de9807c37e637402b1e3c01eac46134e52996e87e688284ea218e2f982f9f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a097f320c4ea66f8c961157d99f54981e28592ab00226ebaa436e58c6aa8e2f7e088b2f8412d980383bdf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +439,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa8269d141506e043f3bb95fc0a089939d5862f1e980336b3205e3aec8eeb6ab",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8422c09e13f47d089db6701a82c4694ad0a180696c82f784f2bccea13c0551a9",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f149",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7618817",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +497,10 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
+    "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x6a56bdcfb4ee581000c23d085b55470f3f918c061f9f7b8afc9a8e35310db417",
-                    "mixHash" : "0x2b803eff91fbb85ccbca248ab69cdcd10f9e275d9ba1e307bc57d1150970cf95",
-                    "nonce" : "0x9a4c3a97c96cf0bc",
+                    "hash" : "0x203957fd8049be659449cbc6f31fa7e7ecdb1d4069563e7561f4a2353ea17934",
+                    "mixHash" : "0x3871cf480374d0c715fcddf416863aed67720b96aec982a657569f43f6a14d4a",
+                    "nonce" : "0x108f2ed14ae9ca65",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a02b803eff91fbb85ccbca248ab69cdcd10f9e275d9ba1e307bc57d1150970cf95889a4c3a97c96cf0bcf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a03871cf480374d0c715fcddf416863aed67720b96aec982a657569f43f6a14d4a88108f2ed14ae9ca65f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a56bdcfb4ee581000c23d085b55470f3f918c061f9f7b8afc9a8e35310db417",
-        "network" : "Homestead",
+        "lastblockhash" : "0x203957fd8049be659449cbc6f31fa7e7ecdb1d4069563e7561f4a2353ea17934",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_d0g0v0_Metropolis" : {
+    "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0x7059042dd26daeaba4dcfeb325a46f473d118e2d6af379dce8a5d9ec433232b3",
-                    "mixHash" : "0xf74c80955950cf14e967b1227d25cd8957c0f5abdef4c7ca9b5352ccdba3b843",
-                    "nonce" : "0xcf3f068d1eb3b191",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0xdb0f82edf1b758cff8e2ed7a35e4a53a6b24fd7057291686bbe01c1c5675d970",
+                    "mixHash" : "0x01ecb43f13aa0a9e464264a119a8f660715de2da28ddb401744d217b5bdff217",
+                    "nonce" : "0xa0e0d41485c87e1f",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
-                    "stateRoot" : "0x9ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188",
+                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
+                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ea8bceb7c9f63cd49dee813801a24534afa23fb1aa371b7ca6aa2968a8ff188a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0f74c80955950cf14e967b1227d25cd8957c0f5abdef4c7ca9b5352ccdba3b84388cf3f068d1eb3b191f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a001ecb43f13aa0a9e464264a119a8f660715de2da28ddb401744d217b5bdff21788a0e0d41485c87e1ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,27 +679,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7059042dd26daeaba4dcfeb325a46f473d118e2d6af379dce8a5d9ec433232b3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdb0f82edf1b758cff8e2ed7a35e4a53a6b24fd7057291686bbe01c1c5675d970",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
+                "balance" : "0x456391824521c6c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -576,7 +704,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
index ce1803915..83ac1071c 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "deleagateCallAfterValueTransfer_d0g0v0_EIP150" : {
+    "deleagateCallAfterValueTransfer_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x80c3fe6989bc8f4e151eda306bbd5f87edf30430911ffd0044a84e6588e29b25",
-                    "mixHash" : "0x5e01a6efce8c4197bb6b6ddded9c4da5710af0a1d421323cd48c7947021e4e67",
-                    "nonce" : "0x5a5a8aa1dc5bd5cf",
+                    "hash" : "0x3bb536d32d96ec5bf64a4e7d07831903d662e88b4082053c84643e981f4656d7",
+                    "mixHash" : "0x93cd2b42cf5ea77810c284294b6aa714d89dc7f03c64ee083774eef2d1595084",
+                    "nonce" : "0x6f12c2ad1a09f629",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
+                    "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
+                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a05e01a6efce8c4197bb6b6ddded9c4da5710af0a1d421323cd48c7947021e4e67885a5a8aa1dc5bd5cff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a093cd2b42cf5ea77810c284294b6aa714d89dc7f03c64ee083774eef2d1595084886f12c2ad1a09f629f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80c3fe6989bc8f4e151eda306bbd5f87edf30430911ffd0044a84e6588e29b25",
-        "network" : "EIP150",
+        "lastblockhash" : "0x3bb536d32d96ec5bf64a4e7d07831903d662e88b4082053c84643e981f4656d7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_d0g0v0_EIP158" : {
+    "deleagateCallAfterValueTransfer_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x7d5eac4c1c8fb18adec4840cd93101749a6798f185a97c94a7dbb03a38db0a77",
-                    "mixHash" : "0x106e19412964af63da707a83d434ce6a0b333c1adf00949a93221e622cdb8780",
-                    "nonce" : "0xdbf23b38211436fb",
+                    "hash" : "0x6076281b4965b9efb889480140311c0cf293c6a337ac0eedb3bb1fd7b5b1e294",
+                    "mixHash" : "0x3291f687cf6265a93e364fb41fe18c51c2a685389e45be8b2cf8b06cccc3c0e0",
+                    "nonce" : "0x21df9acbd393354b",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
+                    "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
+                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0106e19412964af63da707a83d434ce6a0b333c1adf00949a93221e622cdb878088dbf23b38211436fbf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a03291f687cf6265a93e364fb41fe18c51c2a685389e45be8b2cf8b06cccc3c0e08821df9acbd393354bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5eac4c1c8fb18adec4840cd93101749a6798f185a97c94a7dbb03a38db0a77",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6076281b4965b9efb889480140311c0cf293c6a337ac0eedb3bb1fd7b5b1e294",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_d0g0v0_Frontier" : {
+    "deleagateCallAfterValueTransfer_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x8f43800b7c8bc7f27fee92084b38d4ea18606de8751b74e69233fb9e4bb70ffb",
-                    "mixHash" : "0x6518c6f0ed87600228a509551e1230a218140433e3d9b361628ba5d89513e941",
-                    "nonce" : "0x35662562646c149a",
+                    "gasUsed" : "0x0104c0",
+                    "hash" : "0xab1c52a7fd2d07bbcda3a46615d3bb80dda3962d059372b644c9a322281efcf4",
+                    "mixHash" : "0xd15f0837a1db8cc70bcf33067195c4e333ad80ddcdb84b837a8b14ba7ca0acb0",
+                    "nonce" : "0x4fc2355bc4ac8213",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
-                    "stateRoot" : "0x9dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1",
+                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
+                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a06518c6f0ed87600228a509551e1230a218140433e3d9b361628ba5d89513e9418835662562646c149af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0d15f0837a1db8cc70bcf33067195c4e333ad80ddcdb84b837a8b14ba7ca0acb0884fc2355bc4ac8213f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,14 +318,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f43800b7c8bc7f27fee92084b38d4ea18606de8751b74e69233fb9e4bb70ffb",
-        "network" : "Frontier",
+        "lastblockhash" : "0xab1c52a7fd2d07bbcda3a46615d3bb80dda3962d059372b644c9a322281efcf4",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x02" : "0x01"
                 }
             },
             "0x1000000000000000000000000000000000000001" : {
@@ -322,14 +338,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
+                "balance" : "0x4563918244f504c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
+                "balance" : "0x2386f26fbffb40",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +376,10 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
+    "deleagateCallAfterValueTransfer_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01022c",
-                    "hash" : "0x53ab7311dda3e679cf8d48fb405b72d274760a89f03e44463dee32d36b18017b",
-                    "mixHash" : "0x3fb1dc799be64a73dca5ff26d1ae52405bdcc87a4c592eae18ee289d95a4dda7",
-                    "nonce" : "0xa9316a324e7419b3",
+                    "gasUsed" : "0x0104c0",
+                    "hash" : "0xa367b9aef2edb6cfbf2bd26e7b6a9c0feee12035c44418cfe685061257e58ef3",
+                    "mixHash" : "0xb2694c105ec4762ffa6e4c7d700e6f8d5956eb0d1d7733cc5434ef135d25d457",
+                    "nonce" : "0x66d52574e4d55d4a",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
-                    "stateRoot" : "0x5d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1",
+                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
+                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a03fb1dc799be64a73dca5ff26d1ae52405bdcc87a4c592eae18ee289d95a4dda788a9316a324e7419b3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0b2694c105ec4762ffa6e4c7d700e6f8d5956eb0d1d7733cc5434ef135d25d4578866d52574e4d55d4af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53ab7311dda3e679cf8d48fb405b72d274760a89f03e44463dee32d36b18017b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa367b9aef2edb6cfbf2bd26e7b6a9c0feee12035c44418cfe685061257e58ef3",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
@@ -443,14 +459,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5022c",
+                "balance" : "0x4563918244f504c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbffdd4",
+                "balance" : "0x2386f26fbffb40",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -481,10 +497,10 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_d0g0v0_Metropolis" : {
+    "deleagateCallAfterValueTransfer_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0104c0",
-                    "hash" : "0xb0189e896c9e258a66eb89737dc352df788f750eeaa1f514e73366c4cfc7b140",
-                    "mixHash" : "0x7076aca2fd5cf7ef125ba3c2f2c194e467b293cdd8b40b3b293c9da4083f7cb3",
-                    "nonce" : "0xa5bcdf56c7b83439",
+                    "gasUsed" : "0x06e9d9",
+                    "hash" : "0x0ebc9cbba2a537810a3d9d10ef77d36988e21a9dbf7488410ae84375578ded27",
+                    "mixHash" : "0xd2afaec50dead832eba17c7f7b0bfe119abb173842ab743c15aef0187a93ccf1",
+                    "nonce" : "0x89fd01027ab3fb39",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
-                    "stateRoot" : "0x6fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99",
+                    "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
+                    "stateRoot" : "0x9dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06fc3e34d85cfbf736f39e299e574fee73c22583c22a5b5195aad7033b8fcac99a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a07076aca2fd5cf7ef125ba3c2f2c194e467b293cdd8b40b3b293c9da4083f7cb388a5bcdf56c7b83439f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0d2afaec50dead832eba17c7f7b0bfe119abb173842ab743c15aef0187a93ccf18889fd01027ab3fb39f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +560,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0189e896c9e258a66eb89737dc352df788f750eeaa1f514e73366c4cfc7b140",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0ebc9cbba2a537810a3d9d10ef77d36988e21a9dbf7488410ae84375578ded27",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
+                "code" : "0x3460005533600155600035600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fae9d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fba1627",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x3460005533600155600035600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x01022c",
+                    "hash" : "0x537b872a58ad00eb607df4325c34c51191fa3ccb332f3a8a706e9de225aea178",
+                    "mixHash" : "0x561c486fd757093eba733130631ea3cca4872760db6108abe87bf8a3c87540ee",
+                    "nonce" : "0xfef12b411d92e22c",
+                    "number" : "0x01",
+                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+                    "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
+                    "stateRoot" : "0x5d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a0561c486fd757093eba733130631ea3cca4872760db6108abe87bf8a3c87540ee88fef12b411d92e22cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x537b872a58ad00eb607df4325c34c51191fa3ccb332f3a8a706e9de225aea178",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8e0",
                 "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
@@ -571,14 +699,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c0",
+                "balance" : "0x4563918244f5022c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbffb40",
+                "balance" : "0x2386f26fbffdd4",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
index ab0be6fc1..b6a4eb2e6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallAndOOGatTxLevel_d0g0v0_EIP150" : {
+    "delegatecallAndOOGatTxLevel_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x17b171c1f34385fccf821cd375641ddf3826ffa412abac69ad8deaf9c81d485b",
-                    "mixHash" : "0x11b7c85f1099a5f4efb0b4447bffafe721a84a81f1a8f2201f5157d6981dbe71",
-                    "nonce" : "0xddbae83354e139c9",
+                    "hash" : "0x7188fb5ec31ad5491f2d678054c627c9b1342c67f2dfe25ddf756440538d6280",
+                    "mixHash" : "0x020ee33eed0515e396a621710ac7a4182736a284bb2714d8271d9200e186f3a6",
+                    "nonce" : "0x2e85011450a9d783",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
-                    "stateRoot" : "0xef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
+                    "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
+                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a011b7c85f1099a5f4efb0b4447bffafe721a84a81f1a8f2201f5157d6981dbe7188ddbae83354e139c9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0020ee33eed0515e396a621710ac7a4182736a284bb2714d8271d9200e186f3a6882e85011450a9d783f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x17b171c1f34385fccf821cd375641ddf3826ffa412abac69ad8deaf9c81d485b",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7188fb5ec31ad5491f2d678054c627c9b1342c67f2dfe25ddf756440538d6280",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_d0g0v0_EIP158" : {
+    "delegatecallAndOOGatTxLevel_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf131",
+                    "hash" : "0x844db2883374b0cb2c9eb06db629cca41bdb39a99ef3aa821879e78accece471",
+                    "mixHash" : "0xfa479bb9025a548ca800089697b989ad50a0220fcf8fc1c52ed66019641f9840",
+                    "nonce" : "0x154872a5586052b8",
+                    "number" : "0x01",
+                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+                    "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
+                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0fa479bb9025a548ca800089697b989ad50a0220fcf8fc1c52ed66019641f984088154872a5586052b8f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x844db2883374b0cb2c9eb06db629cca41bdb39a99ef3aa821879e78accece471",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f131",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630ecf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallAndOOGatTxLevel_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x76fe89aa11b2b2edc3aaa4c2ab44c25dcf6137c1be998d8007f9399998a70e87",
-                    "mixHash" : "0xb4d489fa2cc640a40d7782f061e3f7d2b872c408396d779d2f3b5fa85fca4e21",
-                    "nonce" : "0xcdac32f08e9043b5",
+                    "hash" : "0x86e7f44bb31dde9220ddb3654367bf6a98a61471cf72b6ebae53f04c1fa9b020",
+                    "mixHash" : "0x132148b8dbb4160b78571d4343a97df8b90a5815538fec9d607f278157bf6aaa",
+                    "nonce" : "0x4520b2705b854d0e",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0b4d489fa2cc640a40d7782f061e3f7d2b872c408396d779d2f3b5fa85fca4e2188cdac32f08e9043b5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0132148b8dbb4160b78571d4343a97df8b90a5815538fec9d607f278157bf6aaa884520b2705b854d0ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76fe89aa11b2b2edc3aaa4c2ab44c25dcf6137c1be998d8007f9399998a70e87",
-        "network" : "EIP158",
+        "lastblockhash" : "0x86e7f44bb31dde9220ddb3654367bf6a98a61471cf72b6ebae53f04c1fa9b020",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_d0g0v0_Frontier" : {
+    "delegatecallAndOOGatTxLevel_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xdcb25840070bc3212a02811bda41c43688894f2409e7f85acda290660f0d8e84",
-                    "mixHash" : "0x8973281be0e38f04b3605b6a15af19d3b53940fafc0406aa6a635177779da436",
-                    "nonce" : "0x3c878ee23444dd27",
+                    "gasUsed" : "0xf131",
+                    "hash" : "0xbc1ccae4566f350c9b33ca15568c16d7523e55ed1a119849b2b04fead28f0022",
+                    "mixHash" : "0x8b8a6bd3fca5eefd0a0aaa87f70630abd6b81107e8f6d73776a78c4ac9902ffa",
+                    "nonce" : "0xde3567c07e943537",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
-                    "stateRoot" : "0x83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
+                    "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
+                    "stateRoot" : "0xef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08973281be0e38f04b3605b6a15af19d3b53940fafc0406aa6a635177779da436883c878ee23444dd27f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a08b8a6bd3fca5eefd0a0aaa87f70630abd6b81107e8f6d73776a78c4ac9902ffa88de3567c07e943537f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +439,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcb25840070bc3212a02811bda41c43688894f2409e7f85acda290660f0d8e84",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbc1ccae4566f350c9b33ca15568c16d7523e55ed1a119849b2b04fead28f0022",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f131",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7630ecf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +497,10 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
+    "delegatecallAndOOGatTxLevel_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -375,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x0d7aad5396da262b5d2b1f121582e7237bcfbd7f52032190196fa89aadb5bb6b",
-                    "mixHash" : "0x1f9f561068a3829fdff3734122c96b5a7a1d15b11bf4c459c93a77e9578fb3ec",
-                    "nonce" : "0xe9fa35dd97167780",
+                    "hash" : "0xfd36007489b21a3a9c017f4685de38c4c7ab87f170654bb734e489c487a567f5",
+                    "mixHash" : "0x111a964fae62eece4e311aa18bee49fba4d794846af5c50ef4960acd88bf8461",
+                    "nonce" : "0xc40d4de461ecaa54",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -386,7 +523,7 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01f9f561068a3829fdff3734122c96b5a7a1d15b11bf4c459c93a77e9578fb3ec88e9fa35dd97167780f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0111a964fae62eece4e311aa18bee49fba4d794846af5c50ef4960acd88bf846188c40d4de461ecaa54f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d7aad5396da262b5d2b1f121582e7237bcfbd7f52032190196fa89aadb5bb6b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xfd36007489b21a3a9c017f4685de38c4c7ab87f170654bb734e489c487a567f5",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -479,10 +616,10 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_d0g0v0_Metropolis" : {
+    "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +630,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf131",
-                    "hash" : "0x8ee300cc3119ae9a0e8b22fff5c984a29f60fa67a2655461094d1593c83fee06",
-                    "mixHash" : "0xc0e8148bfacab819380508d868a93c617f2391d9b859f23eeba4e4d3a5ff6bc8",
-                    "nonce" : "0xb7f5ce39932a0c90",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0xaf444841387eb5739801e3c2070c0cebe503360a56c046e081394d95f1855c41",
+                    "mixHash" : "0x11e9603ee0f2bcebb4d3c7fb5e9facf6e3c3b9d60e0a7433533dd3c056259b1b",
+                    "nonce" : "0x1ac4128cefa36a2a",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
-                    "stateRoot" : "0x5918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4",
+                    "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
+                    "stateRoot" : "0x83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05918263e8b71771aaa677ed31b0b1b39b4243a681029607d618665b0fd954ec4a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a0c0e8148bfacab819380508d868a93c617f2391d9b859f23eeba4e4d3a5ff6bc888b7f5ce39932a0c90f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a011e9603ee0f2bcebb4d3c7fb5e9facf6e3c3b9d60e0a7433533dd3c056259b1b881ac4128cefa36a2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,27 +679,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ee300cc3119ae9a0e8b22fff5c984a29f60fa67a2655461094d1593c83fee06",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xaf444841387eb5739801e3c2070c0cebe503360a56c046e081394d95f1855c41",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f131",
+                "balance" : "0x456391824521c6c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -576,7 +704,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ecf",
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
index 1794793e4..39ada150b 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallBasic_d0g0v0_EIP150" : {
+    "delegatecallBasic_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0xad75f9ffa50fd35feca5eecbfe6b43a4347ee4323b2ffbddee37a093087e8132",
-                    "mixHash" : "0x99c6c83f228ee548bda762fd40fa4fe1ac9282d0b421add241e3e74ebec762af",
-                    "nonce" : "0xcc6a6ae487a6789a",
+                    "hash" : "0x656215b6f7110db0d5a7ea7f9a84201ef9f30204a960b631acda80ef61616ea4",
+                    "mixHash" : "0x8b51145578de2e0b2daea4b7d7417f9b5c6ec039438107badce8a6e42d945f8e",
+                    "nonce" : "0x6547dd4491a2e93b",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
+                    "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
+                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a099c6c83f228ee548bda762fd40fa4fe1ac9282d0b421add241e3e74ebec762af88cc6a6ae487a6789af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a08b51145578de2e0b2daea4b7d7417f9b5c6ec039438107badce8a6e42d945f8e886547dd4491a2e93bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad75f9ffa50fd35feca5eecbfe6b43a4347ee4323b2ffbddee37a093087e8132",
-        "network" : "EIP150",
+        "lastblockhash" : "0x656215b6f7110db0d5a7ea7f9a84201ef9f30204a960b631acda80ef61616ea4",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "delegatecallBasic_d0g0v0_EIP158" : {
+    "delegatecallBasic_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x4ca3cf6ef53b8358baecbd1141b8fb6db6cb12e95805984edaba80cc4f115ce6",
-                    "mixHash" : "0x99540aab8fb06436e8ef443998495a0f718fac379aff45dd4924feacf777b313",
-                    "nonce" : "0x2f725b40c53f0e7b",
+                    "hash" : "0x79814befe05421b9107c95001eb135d19dc55518d326bc023142a5eb37577530",
+                    "mixHash" : "0x5c156747401fbf49b59e3fbe06fe5b8025e6cd384da6fe7d60de0d633e4de70f",
+                    "nonce" : "0x6be6c73aa7a82917",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
+                    "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
+                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a099540aab8fb06436e8ef443998495a0f718fac379aff45dd4924feacf777b313882f725b40c53f0e7bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a05c156747401fbf49b59e3fbe06fe5b8025e6cd384da6fe7d60de0d633e4de70f886be6c73aa7a82917f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ca3cf6ef53b8358baecbd1141b8fb6db6cb12e95805984edaba80cc4f115ce6",
-        "network" : "EIP158",
+        "lastblockhash" : "0x79814befe05421b9107c95001eb135d19dc55518d326bc023142a5eb37577530",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "delegatecallBasic_d0g0v0_Frontier" : {
+    "delegatecallBasic_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x844e48185ddb89c8b53315983a9d43b8ccf440ef19a945b298982662181f83b3",
-                    "mixHash" : "0xff4103becce889f80ff95e6d61b7cdcde38c99e20e4b701aa059d67248faa3c2",
-                    "nonce" : "0xd7d1537505f8cf2c",
+                    "gasUsed" : "0xf137",
+                    "hash" : "0xfc42fdb77007a8b816a0c0c2d9217e5c2abb1f8ecbe6747cc392cb0390edf578",
+                    "mixHash" : "0x013b6cffb448792782f9f5319c41a1cfe1e432adc38c22e1197b9ae1e27c7e91",
+                    "nonce" : "0xaa1ce74910dd0aaa",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
-                    "stateRoot" : "0x7940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85",
+                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
+                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ff4103becce889f80ff95e6d61b7cdcde38c99e20e4b701aa059d67248faa3c288d7d1537505f8cf2cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0013b6cffb448792782f9f5319c41a1cfe1e432adc38c22e1197b9ae1e27c7e9188aa1ce74910dd0aaaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +318,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x844e48185ddb89c8b53315983a9d43b8ccf440ef19a945b298982662181f83b3",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfc42fdb77007a8b816a0c0c2d9217e5c2abb1f8ecbe6747cc392cb0390edf578",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f137",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +345,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7630ec9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +376,10 @@
             }
         }
     },
-    "delegatecallBasic_d0g0v0_Homestead" : {
+    "delegatecallBasic_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xeea3",
-                    "hash" : "0x8fd43ec626a08f717c2bf11eba8fba400f20b3608e923548bdf66e58778a1505",
-                    "mixHash" : "0x630fffafdebb8bc3e93d2bfec68945f8f832cea4b5f211c16fef9f79f55f1dac",
-                    "nonce" : "0x963113045b8d3cf3",
+                    "gasUsed" : "0xf137",
+                    "hash" : "0x79d9c821846693649618f0cada726e8b0f338540ceacf06af8edab4d53892a2d",
+                    "mixHash" : "0xfd63882b2439477c3e5028f2d02f8c3c0e9776f6eae9e706175a7eb9c0b44ed9",
+                    "nonce" : "0x8aebedf209ef7658",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
-                    "stateRoot" : "0xae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936",
+                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
+                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a0630fffafdebb8bc3e93d2bfec68945f8f832cea4b5f211c16fef9f79f55f1dac88963113045b8d3cf3f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0fd63882b2439477c3e5028f2d02f8c3c0e9776f6eae9e706175a7eb9c0b44ed9888aebedf209ef7658f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8fd43ec626a08f717c2bf11eba8fba400f20b3608e923548bdf66e58778a1505",
-        "network" : "Homestead",
+        "lastblockhash" : "0x79d9c821846693649618f0cada726e8b0f338540ceacf06af8edab4d53892a2d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -436,7 +452,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eea3",
+                "balance" : "0x4563918244f4f137",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -450,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763115d",
+                "balance" : "0x0de0b6b3a7630ec9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -481,10 +497,10 @@
             }
         }
     },
-    "delegatecallBasic_d0g0v0_Metropolis" : {
+    "delegatecallBasic_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf137",
-                    "hash" : "0x065b0a6913084ad9d51ad7606ee8a8a208d532e538ec6c534d1cb7b842d79a91",
-                    "mixHash" : "0x4240b4417634d59985aace26d00da855cb4bf106fdd9c841292a89e9ddee2baf",
-                    "nonce" : "0x9f608f23c5d899fd",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0x6c6e10dd9a2f4295ce4358644a6af1dcf5284a264e5c6e64a4efa94a157863c3",
+                    "mixHash" : "0xc8c878916c130aa8131b1dcd3d27cad0daf59d13932faad6f0ec3758be369f5b",
+                    "nonce" : "0x9bf09215f2ac02e1",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
-                    "stateRoot" : "0xcc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5",
+                    "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
+                    "stateRoot" : "0x7940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc8b71ff8e060a86639d244d5eb267f9c7b8d75b56780514de5aff883e6cc4a5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a04240b4417634d59985aace26d00da855cb4bf106fdd9c841292a89e9ddee2baf889f608f23c5d899fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c8c878916c130aa8131b1dcd3d27cad0daf59d13932faad6f0ec3758be369f5b889bf09215f2ac02e1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +560,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x065b0a6913084ad9d51ad7606ee8a8a208d532e538ec6c534d1cb7b842d79a91",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6c6e10dd9a2f4295ce4358644a6af1dcf5284a264e5c6e64a4efa94a157863c3",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824521c6c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallBasic_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xeea3",
+                    "hash" : "0x8d5cc3e982813286aec80b243dc4c1774bf7b4ce6925aff5f126430b09f1f54c",
+                    "mixHash" : "0x2d0ed7a6b0c926c93a8323fff3a43c1aaaba5d29836eae5af480ff3af3c528b8",
+                    "nonce" : "0x06ab760ef8e608f7",
+                    "number" : "0x01",
+                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+                    "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
+                    "stateRoot" : "0xae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a02d0ed7a6b0c926c93a8323fff3a43c1aaaba5d29836eae5af480ff3af3c528b88806ab760ef8e608f7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8d5cc3e982813286aec80b243dc4c1774bf7b4ce6925aff5f126430b09f1f54c",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -564,7 +692,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f137",
+                "balance" : "0x4563918244f4eea3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -578,7 +706,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec9",
+                "balance" : "0x0de0b6b3a763115d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
index 02afe3f76..2cd6781ac 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallEmptycontract_d0g0v0_EIP150" : {
+    "delegatecallEmptycontract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0xdfaaba3b60dc4574b0295a8a5c7a099096c29994a30822f1be88032afa6fa834",
-                    "mixHash" : "0x4d866402d99033ef0b4864445d127d16aec3573e616671538facd857def2a668",
-                    "nonce" : "0xeee9642ffe1b60d7",
+                    "hash" : "0x191126d57204e4e6d09db7e8fac6063e7b6ae13235408111bed6c3cae32102d1",
+                    "mixHash" : "0x56b5adfeae13cb3619bf6faa9711f3f061e8ee7924ecefa5be4bb0e974bed6fb",
+                    "nonce" : "0x66564b5573693ccf",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
+                    "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
+                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a04d866402d99033ef0b4864445d127d16aec3573e616671538facd857def2a66888eee9642ffe1b60d7f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a056b5adfeae13cb3619bf6faa9711f3f061e8ee7924ecefa5be4bb0e974bed6fb8866564b5573693ccff862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfaaba3b60dc4574b0295a8a5c7a099096c29994a30822f1be88032afa6fa834",
-        "network" : "EIP150",
+        "lastblockhash" : "0x191126d57204e4e6d09db7e8fac6063e7b6ae13235408111bed6c3cae32102d1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "delegatecallEmptycontract_d0g0v0_EIP158" : {
+    "delegatecallEmptycontract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0x6e814223009978eca9f53cccfbfaa6c3f4f0928b21a450fabd278de49622e2ee",
-                    "mixHash" : "0x658486081afb725a85dfae5c63f233db66bfcf631b352ee11440df434e673653",
-                    "nonce" : "0x2dbeedd12c36fa36",
+                    "hash" : "0x49f2b0f9747fd79047d4f818f5bbe0bfd6b8a9b4ee55ec9ad957f1ec8a6edbec",
+                    "mixHash" : "0xfb32918a76def6502055a32eb6be496797f6983e4b540962b6589131b38db267",
+                    "nonce" : "0x99ff65b69b5ce894",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
+                    "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
+                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0658486081afb725a85dfae5c63f233db66bfcf631b352ee11440df434e673653882dbeedd12c36fa36f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0fb32918a76def6502055a32eb6be496797f6983e4b540962b6589131b38db2678899ff65b69b5ce894f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e814223009978eca9f53cccfbfaa6c3f4f0928b21a450fabd278de49622e2ee",
-        "network" : "EIP158",
+        "lastblockhash" : "0x49f2b0f9747fd79047d4f818f5bbe0bfd6b8a9b4ee55ec9ad957f1ec8a6edbec",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "delegatecallEmptycontract_d0g0v0_Frontier" : {
+    "delegatecallEmptycontract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x019a54",
-                    "hash" : "0xf73be295148879929aa2796e0004d9cb0df77e48384d460ccda286d5ffc3f9db",
-                    "mixHash" : "0xdb288044a385d2de3c38a64ca50fbac38fc22c8859420fd96d8e4d229cb0b0c2",
-                    "nonce" : "0x7130cd573aba6361",
+                    "gasUsed" : "0xa2ff",
+                    "hash" : "0xc624ef17576feba9b8512d4757e0a22212807ef3b5936bcf871c1bd7f98f8124",
+                    "mixHash" : "0xf76918520bec463163a825b0d9ce52d2647008247a4a2dcea32e6776fef90ac4",
+                    "nonce" : "0xce67fe750ec06b06",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
-                    "stateRoot" : "0xdae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1",
+                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
+                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0db288044a385d2de3c38a64ca50fbac38fc22c8859420fd96d8e4d229cb0b0c2887130cd573aba6361f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0f76918520bec463163a825b0d9ce52d2647008247a4a2dcea32e6776fef90ac488ce67fe750ec06b06f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,25 +288,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf73be295148879929aa2796e0004d9cb0df77e48384d460ccda286d5ffc3f9db",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc624ef17576feba9b8512d4757e0a22212807ef3b5936bcf871c1bd7f98f8124",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59a54",
+                "balance" : "0x4563918244f4a2ff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f2e8c",
+                "balance" : "0x1025e1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +331,10 @@
             }
         }
     },
-    "delegatecallEmptycontract_d0g0v0_Homestead" : {
+    "delegatecallEmptycontract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -330,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa06b",
-                    "hash" : "0x2a3e7d836b25dfa18295adb9ba61fb62ab83a0e2658a302efe2c12bb92f48bf8",
-                    "mixHash" : "0x4bf37e56c245f9b017c92714d35f31dca63b765c01d24406fa9cc7a6c2ebd083",
-                    "nonce" : "0xfbae949eb4167ee3",
+                    "gasUsed" : "0xa2ff",
+                    "hash" : "0xaec302a3d366798395bed92ed8b6ca4374e754813658ad71dc4124f82e0bc1d5",
+                    "mixHash" : "0x29b2a922073ac4816b9b50d406b4344b92456b0dd045c2479674519e25eba9a3",
+                    "nonce" : "0xa30ae99349476534",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
-                    "stateRoot" : "0x8ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadd",
+                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
+                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a04bf37e56c245f9b017c92714d35f31dca63b765c01d24406fa9cc7a6c2ebd08388fbae949eb4167ee3f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a029b2a922073ac4816b9b50d406b4344b92456b0dd045c2479674519e25eba9a388a30ae99349476534f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -379,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a3e7d836b25dfa18295adb9ba61fb62ab83a0e2658a302efe2c12bb92f48bf8",
-        "network" : "Homestead",
+        "lastblockhash" : "0xaec302a3d366798395bed92ed8b6ca4374e754813658ad71dc4124f82e0bc1d5",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
@@ -391,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a06b",
+                "balance" : "0x4563918244f4a2ff",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x102875",
+                "balance" : "0x1025e1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +437,10 @@
             }
         }
     },
-    "delegatecallEmptycontract_d0g0v0_Metropolis" : {
+    "delegatecallEmptycontract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -436,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa2ff",
-                    "hash" : "0x4d326d5110b2cd0506fd01713f0d8c75ba9bc7527e27ad602931230de48b5c65",
-                    "mixHash" : "0x413fe8e3e724b7d8abc30fa010a1b89b1bc3c9ceb961beb55cd5d92f3667b5d0",
-                    "nonce" : "0xdeff31ce41338bea",
+                    "gasUsed" : "0x019a54",
+                    "hash" : "0xfebfcac101ecbf19c8aaaa4ce778931fb2a79dfe68c89d7fef8695a856037009",
+                    "mixHash" : "0xd7b4b2ceed0f1974de82ef06bf058a33e514fc079c75ab56ce1e7e57d9cdac29",
+                    "nonce" : "0x23cac0a5d8ee08a9",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
-                    "stateRoot" : "0x31ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8",
+                    "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
+                    "stateRoot" : "0xdae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031ac93686a02bcf753ea1aae2f4d1f77bd2112df445932f78174160ea2a794f8a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a0413fe8e3e724b7d8abc30fa010a1b89b1bc3c9ceb961beb55cd5d92f3667b5d088deff31ce41338beaf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a0d7b4b2ceed0f1974de82ef06bf058a33e514fc079c75ab56ce1e7e57d9cdac298823cac0a5d8ee08a9f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,16 +500,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d326d5110b2cd0506fd01713f0d8c75ba9bc7527e27ad602931230de48b5c65",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfebfcac101ecbf19c8aaaa4ce778931fb2a79dfe68c89d7fef8695a856037009",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f59a54",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f2e8c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x03e8",
+                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallEmptycontract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xa06b",
+                    "hash" : "0x63ce5f7af5a7073604da3b7d7e288cf1f5764682eb9c006972ae1ab048ce9651",
+                    "mixHash" : "0xe29bf4d4ee7b698f94a584895b834e593cb56f1d92c0fea929d9d5e627ba6872",
+                    "nonce" : "0x57ff6da99a967d4d",
+                    "number" : "0x01",
+                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+                    "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
+                    "stateRoot" : "0x8ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a0e29bf4d4ee7b698f94a584895b834e593cb56f1d92c0fea929d9d5e627ba68728857ff6da99a967d4df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x019a54",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
+                        "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x63ce5f7af5a7073604da3b7d7e288cf1f5764682eb9c006972ae1ab048ce9651",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x03e8",
                 "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
@@ -504,14 +617,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a2ff",
+                "balance" : "0x4563918244f4a06b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1025e1",
+                "balance" : "0x102875",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
index 7ea99c7f3..29579d845 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP150" : {
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0x0170fd293d16f7077b1c4e0182500f5db18b5075477ed7acf7a94cca46a47610",
-                    "mixHash" : "0x1eb2a34ef9e114159ada6551a85b19c22df22577454bfc95345c6b47085e4842",
-                    "nonce" : "0x1527dfe38f1a35bc",
+                    "hash" : "0x446718314233bc206cb96c3aeaf980d15b018225d40ee48dc3ebd1c4471a8c47",
+                    "mixHash" : "0xeb6a38b3413788322063b402cf2ebf5a1f0c9b2e72485fe50842602e78381a7f",
+                    "nonce" : "0x40cae8227677480c",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
-                    "stateRoot" : "0x517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03a",
+                    "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
+                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a01eb2a34ef9e114159ada6551a85b19c22df22577454bfc95345c6b47085e4842881527dfe38f1a35bcf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0eb6a38b3413788322063b402cf2ebf5a1f0c9b2e72485fe50842602e78381a7f8840cae8227677480cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0170fd293d16f7077b1c4e0182500f5db18b5075477ed7acf7a94cca46a47610",
-        "network" : "EIP150",
+        "lastblockhash" : "0x446718314233bc206cb96c3aeaf980d15b018225d40ee48dc3ebd1c4471a8c47",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01"
                 }
@@ -112,10 +119,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP158" : {
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0xae993ce107d22e3ed853aa479eee567eb2993c2518a21b181a009049b19cab72",
-                    "mixHash" : "0xa49b04566fcadf84e2f307409af8aa9ac2e38c294eb51303d6d7b7290c95ae2f",
-                    "nonce" : "0xb95fbc5e0d0ab6d4",
+                    "hash" : "0xefc01a3d63e89d5eaf57064d937c72f563b81ff4d42a739c0aef2d8ccff296c5",
+                    "mixHash" : "0x3d911ad25bbec60d4bc27826dff58b73750a9ddc8f26cb3c43966d6c39014c56",
+                    "nonce" : "0xde26fb30b718137a",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
-                    "stateRoot" : "0x25b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0a",
+                    "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
+                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0a49b04566fcadf84e2f307409af8aa9ac2e38c294eb51303d6d7b7290c95ae2f88b95fbc5e0d0ab6d4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a03d911ad25bbec60d4bc27826dff58b73750a9ddc8f26cb3c43966d6c39014c5688de26fb30b718137af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae993ce107d22e3ed853aa479eee567eb2993c2518a21b181a009049b19cab72",
-        "network" : "EIP158",
+        "lastblockhash" : "0xefc01a3d63e89d5eaf57064d937c72f563b81ff4d42a739c0aef2d8ccff296c5",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_Frontier" : {
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +253,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0xac80e533a588862b2a76613b18cdbc5692af7eff3432951d99db8ef08fd2cfcb",
-                    "mixHash" : "0xbd38ada9f04bac72c42888bf9999ff1260b4f3826a6cc791e83591aa12708ac7",
-                    "nonce" : "0xfc9ece3bc04b8ab8",
+                    "gasUsed" : "0x012020",
+                    "hash" : "0xb5de0679ca8f62b6230b320f094798c72c9bfb19c6b060d06793843704662dd6",
+                    "mixHash" : "0xb051657aa74ad4b864cbe20f4540100f8939e3084c0fcae76920440824d51eba",
+                    "nonce" : "0x63ae5edd3debf1c4",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
-                    "stateRoot" : "0x1b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1",
+                    "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
+                    "stateRoot" : "0x517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0bd38ada9f04bac72c42888bf9999ff1260b4f3826a6cc791e83591aa12708ac788fc9ece3bc04b8ab8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0b051657aa74ad4b864cbe20f4540100f8939e3084c0fcae76920440824d51eba8863ae5edd3debf1c4f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,25 +302,33 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac80e533a588862b2a76613b18cdbc5692af7eff3432951d99db8ef08fd2cfcb",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb5de0679ca8f62b6230b320f094798c72c9bfb19c6b060d06793843704662dd6",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
+                "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
+                "balance" : "0x4563918244f52020",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
+                "balance" : "0x2386f26fbfdfe0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -330,10 +352,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -344,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x011d8c",
-                    "hash" : "0x0a76db589cd666a24a68c85f2bcf763523edf5b21fb672481602d840c0d395af",
-                    "mixHash" : "0xd37717aab9d582d354a70ae7bffb324654ae1207ecdb6b8dad91de7fdf494b1f",
-                    "nonce" : "0xc0d639b49307242b",
+                    "gasUsed" : "0x012020",
+                    "hash" : "0xd5cfc321b7bbe571fb89efb70909aee5d21b484c0cc0e63987c7b12d933e4c9b",
+                    "mixHash" : "0xefcbc1c30b96e5b1ee9bce3a107675c6f40aa2a9f83cdb9928ed8a1c7a7bd796",
+                    "nonce" : "0xe265af1da77cea1c",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
-                    "stateRoot" : "0xc70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5e",
+                    "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
+                    "stateRoot" : "0x25b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a0d37717aab9d582d354a70ae7bffb324654ae1207ecdb6b8dad91de7fdf494b1f88c0d639b49307242bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0efcbc1c30b96e5b1ee9bce3a107675c6f40aa2a9f83cdb9928ed8a1c7a7bd79688e265af1da77cea1cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -393,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a76db589cd666a24a68c85f2bcf763523edf5b21fb672481602d840c0d395af",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd5cfc321b7bbe571fb89efb70909aee5d21b484c0cc0e63987c7b12d933e4c9b",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -406,20 +428,20 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51d8c",
+                "balance" : "0x4563918244f52020",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfe274",
+                "balance" : "0x2386f26fbfdfe0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -443,10 +465,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_d0g0v0_Metropolis" : {
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,19 +479,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012020",
-                    "hash" : "0x693860945de4b14e0ea86c66270d1f8dc15c31be94f76dc56ff65a2e803275ee",
-                    "mixHash" : "0x91eb9e5c0988961df072fd82cb1db0e38d22e6a2aa09afa6f2988b0e86f6ecb2",
-                    "nonce" : "0x449a71b166546985",
+                    "gasUsed" : "0x06e9d9",
+                    "hash" : "0x9f6a897cda664d624fea1a26d0c8517e6024eb85aad92177e2ed79e4d5a7884d",
+                    "mixHash" : "0x43daf3c1b84b428f78c0108c131f73f8238d689184f3665409e274eb0f492a23",
+                    "nonce" : "0x2c790a2e1ae33596",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
-                    "stateRoot" : "0xbbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49",
+                    "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
+                    "stateRoot" : "0x1b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bbdee684eab6cf971cbd8851c13ebd967f9a3e562f0075d109fe5755a6f77a49a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a091eb9e5c0988961df072fd82cb1db0e38d22e6a2aa09afa6f2988b0e86f6ecb288449a71b166546985f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a043daf3c1b84b428f78c0108c131f73f8238d689184f3665409e274eb0f492a23882c790a2e1ae33596f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -506,16 +528,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x693860945de4b14e0ea86c66270d1f8dc15c31be94f76dc56ff65a2e803275ee",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9f6a897cda664d624fea1a26d0c8517e6024eb85aad92177e2ed79e4d5a7884d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fae9d9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fba1627",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x011d8c",
+                    "hash" : "0x349c60c22b4e62bbf9435dbe5d878434bcc0c7ca8a34634ef0994f885436d42b",
+                    "mixHash" : "0x55b70ff3ad21243922f53a0d7020e5c0a2bcd7f8ac9840082cb03414c7c0ee5a",
+                    "nonce" : "0xf31921175a75e801",
+                    "number" : "0x01",
+                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+                    "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
+                    "stateRoot" : "0xc70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a055b70ff3ad21243922f53a0d7020e5c0a2bcd7f8ac9840082cb03414c7c0ee5a88f31921175a75e801f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x349c60c22b4e62bbf9435dbe5d878434bcc0c7ca8a34634ef0994f885436d42b",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
@@ -526,20 +646,20 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52020",
+                "balance" : "0x4563918244f51d8c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfdfe0",
+                "balance" : "0x2386f26fbfe274",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
index 4a4846c78..f429c56e5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP150" : {
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x0de19852846bef2a506e1665d1d859432bffef36ef0c54caf527a13f9aacda38",
-                    "mixHash" : "0x082a4d708bbe3fb2329c4b67fdb04014bd12f69844600bc456fd27dcff378329",
-                    "nonce" : "0xe7d34e802ac677cf",
+                    "hash" : "0x26500fe4e6b492f97fc339bcf34c736532fd6ab0d7d6cb9769e4ede772920f5c",
+                    "mixHash" : "0xb4b6a6c67d40206e80448e708aac537cfb6ac11194ac5afd7eaf53f9eb5035a3",
+                    "nonce" : "0xfdb418e7099e738d",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
-                    "stateRoot" : "0xacf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9",
+                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
+                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0082a4d708bbe3fb2329c4b67fdb04014bd12f69844600bc456fd27dcff37832988e7d34e802ac677cff862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b4b6a6c67d40206e80448e708aac537cfb6ac11194ac5afd7eaf53f9eb5035a388fdb418e7099e738df862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0de19852846bef2a506e1665d1d859432bffef36ef0c54caf527a13f9aacda38",
-        "network" : "EIP150",
+        "lastblockhash" : "0x26500fe4e6b492f97fc339bcf34c736532fd6ab0d7d6cb9769e4ede772920f5c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x05",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x02" : "0x01",
                     "0x0a" : "0x01",
@@ -128,10 +135,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP158" : {
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -143,18 +150,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01bc6b",
-                    "hash" : "0x3e9f9861b7eddae068c88d70ff8b47e8f174d9a041b8e3e93f12e2d987802fa1",
-                    "mixHash" : "0xb31ca48f17b62f71a3230e4a3816d24e4b24956b3f582bb193cd386c9be8b3eb",
-                    "nonce" : "0x6486ba184ed1f83a",
+                    "hash" : "0xfad96dd4a43922c3698547d7b883d7a810069c050a5c76329c351ba1225b0302",
+                    "mixHash" : "0xb86d3a8a0e67f0f4e56e42db78d4117abf38e341eb86b7297f137a33db8ee85e",
+                    "nonce" : "0x8dbec29102caf991",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
-                    "stateRoot" : "0xecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3",
+                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
+                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b31ca48f17b62f71a3230e4a3816d24e4b24956b3f582bb193cd386c9be8b3eb886486ba184ed1f83af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0b86d3a8a0e67f0f4e56e42db78d4117abf38e341eb86b7297f137a33db8ee85e888dbec29102caf991f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -191,9 +198,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e9f9861b7eddae068c88d70ff8b47e8f174d9a041b8e3e93f12e2d987802fa1",
-        "network" : "EIP158",
+        "lastblockhash" : "0xfad96dd4a43922c3698547d7b883d7a810069c050a5c76329c351ba1225b0302",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
@@ -257,10 +271,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Frontier" : {
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -271,19 +285,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x025608",
-                    "hash" : "0x55fb61055a50043f777b10c2f363f75398e00e84a79819373b209652b13a55fa",
-                    "mixHash" : "0x5ed08a0a579979389de5adda2f11426f5682d94fb4522b2ed69e60cdec277394",
-                    "nonce" : "0x6f68ebc8f898753d",
+                    "gasUsed" : "0x01bc6b",
+                    "hash" : "0x9c79017d6ee9e82476c33b818299987a9ecd073bb1f69316ecab3cf467d37236",
+                    "mixHash" : "0x33ade67d5118edddcf029b5de4fb9625269ecd27e2649d5791a8c8d76ee8819d",
+                    "nonce" : "0x44fe9c77b6c8b9fa",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
-                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
+                    "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
+                    "stateRoot" : "0xacf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a05ed08a0a579979389de5adda2f11426f5682d94fb4522b2ed69e60cdec277394886f68ebc8f898753df862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a033ade67d5118edddcf029b5de4fb9625269ecd27e2649d5791a8c8d76ee8819d8844fe9c77b6c8b9faf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -320,18 +334,28 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55fb61055a50043f777b10c2f363f75398e00e84a79819373b209652b13a55fa",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9c79017d6ee9e82476c33b818299987a9ecd073bb1f69316ecab3cf467d37236",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
+                "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x05",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x0a" : "0x01",
+                    "0x0b" : "0x1000000000000000000000000000000000000000"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f65608",
+                "balance" : "0x4563918244f5bc6b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -345,7 +369,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbea9f8",
+                "balance" : "0x2386f26fbf4395",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -376,10 +400,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -390,19 +414,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x025608",
-                    "hash" : "0x1c2f8aa78c9e4dd6c61bbe09a0454e7c2f0fb559cd40feed29c2025889d4c19e",
-                    "mixHash" : "0x3718efcec5fff83aeb8efd134f55a437b7ac1e780da38ef266913e41d80cd182",
-                    "nonce" : "0xaf78736bceaff12a",
+                    "gasUsed" : "0x01bc6b",
+                    "hash" : "0xcf184d9cd36c7d3c5a1efd99d9113550ebe8dd5a8b5cdaa714e7a6d8ac52e2aa",
+                    "mixHash" : "0x5e66a5affc24d073b3d7c0a1baa9ef1fcdaffb709aff603f6a23a773a7ff6864",
+                    "nonce" : "0xd42e2bbfa7d04a4c",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
-                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
+                    "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
+                    "stateRoot" : "0xecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a03718efcec5fff83aeb8efd134f55a437b7ac1e780da38ef266913e41d80cd18288af78736bceaff12af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a05e66a5affc24d073b3d7c0a1baa9ef1fcdaffb709aff603f6a23a773a7ff686488d42e2bbfa7d04a4cf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -439,18 +463,28 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c2f8aa78c9e4dd6c61bbe09a0454e7c2f0fb559cd40feed29c2025889d4c19e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcf184d9cd36c7d3c5a1efd99d9113550ebe8dd5a8b5cdaa714e7a6d8ac52e2aa",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
+                "balance" : "0x270b",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x05",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x0a" : "0x01",
+                    "0x0b" : "0x1000000000000000000000000000000000000000"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f65608",
+                "balance" : "0x4563918244f5bc6b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -464,7 +498,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbea9f8",
+                "balance" : "0x2386f26fbf4395",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -495,10 +529,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Metropolis" : {
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -509,19 +543,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01bc6b",
-                    "hash" : "0xb92261bfe458338fc6b0b327bec6a5ec38c904fed2fe0c49cccd19d69add359e",
-                    "mixHash" : "0x602725e6b4a3de471a4833e89fc0966cce0653ee48adcefc8219a92a9c2a2cd1",
-                    "nonce" : "0xa0bd567b38584dfb",
+                    "gasUsed" : "0x025608",
+                    "hash" : "0x7bea798cc0e663120f91fe848184b0595e75a2ab80e30d9441e43a6db1251cf8",
+                    "mixHash" : "0x44ebeb8e6543ab277f8817896cf68a81237a70ab8572b8dd3856c16f87c50cc8",
+                    "nonce" : "0xa77325d348b297b1",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
-                    "stateRoot" : "0x5fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001b",
+                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
+                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05fb13c329d43c7f0b607756299cd01c35a008c800b125ecfd10b201c2041001ba0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0602725e6b4a3de471a4833e89fc0966cce0653ee48adcefc8219a92a9c2a2cd188a0bd567b38584dfbf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a044ebeb8e6543ab277f8817896cf68a81237a70ab8572b8dd3856c16f87c50cc888a77325d348b297b1f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -558,35 +592,137 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb92261bfe458338fc6b0b327bec6a5ec38c904fed2fe0c49cccd19d69add359e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7bea798cc0e663120f91fe848184b0595e75a2ab80e30d9441e43a6db1251cf8",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f65608",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbea9f8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270b",
+                "balance" : "0x2710",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x05",
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
                 "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x025608",
+                    "hash" : "0xa8207115e9415893e8aef46c03a55320c4445d063fa6de8e4c85c7400fd0c752",
+                    "mixHash" : "0x3f3f498c87db2899c2989323fb7372d8c8370ec42aa8390b59640845f90782d2",
+                    "nonce" : "0xe6541144c97efa80",
+                    "number" : "0x01",
+                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
+                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a03f3f498c87db2899c2989323fb7372d8c8370ec42aa8390b59640845f90782d288e6541144c97efa80f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x025608",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
+                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa8207115e9415893e8aef46c03a55320c4445d063fa6de8e4c85c7400fd0c752",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x02" : "0x01",
-                    "0x0a" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5bc6b",
+                "balance" : "0x4563918244f65608",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -600,7 +736,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf4395",
+                "balance" : "0x2386f26fbea9f8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
index 14e306272..07da571c7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallInInitcodeToExistingContract_d0g0v0_EIP150" : {
+    "delegatecallInInitcodeToExistingContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x2e1a921ba3f96ed8cf3ff16a9c3cb1f37d18853bc1af5b16c710d0bdb17612f9",
-                    "mixHash" : "0x350f82262436b5d3f71a0c3113072ebd685a3b7c0c2f00dfdca54d4b84556b74",
-                    "nonce" : "0xdf94d0390bc1f359",
+                    "hash" : "0x58d26dd64cb83b473dba4d8ee68427762f3a667810206066723305e21a8f7897",
+                    "mixHash" : "0x01e8a478cfd91fffa9a1c7e3d90981155007108a710eb5fb724154dbdf3dddc6",
+                    "nonce" : "0xb08c78e515b608e5",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
-                    "stateRoot" : "0xaa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983",
+                    "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
+                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0350f82262436b5d3f71a0c3113072ebd685a3b7c0c2f00dfdca54d4b84556b7488df94d0390bc1f359f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a001e8a478cfd91fffa9a1c7e3d90981155007108a710eb5fb724154dbdf3dddc688b08c78e515b608e5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e1a921ba3f96ed8cf3ff16a9c3cb1f37d18853bc1af5b16c710d0bdb17612f9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x58d26dd64cb83b473dba4d8ee68427762f3a667810206066723305e21a8f7897",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -82,7 +89,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x1000000000000000000000000000000000000000",
@@ -143,10 +150,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_d0g0v0_EIP158" : {
+    "delegatecallInInitcodeToExistingContract_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -158,18 +165,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x3607f8d64e4004cfbe68854885533f255b22dfcf680224744690264eb1185608",
-                    "mixHash" : "0xd965747873fe8fee7fc2c25a8dd029d0a4fc8bf44a500321cf9b4d9000518b7b",
-                    "nonce" : "0x35424095c3db087e",
+                    "hash" : "0xd8d4448a3aff1f0464ecf67ab538496915be4dadc4a52b9c8c5ddcd6013342a4",
+                    "mixHash" : "0x8790f68e938cd478835d21ff5efb8bb7245fdc4d1274e464155d630e97025248",
+                    "nonce" : "0x7b157830206f3a15",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
-                    "stateRoot" : "0x4dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55",
+                    "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
+                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0d965747873fe8fee7fc2c25a8dd029d0a4fc8bf44a500321cf9b4d9000518b7b8835424095c3db087ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a08790f68e938cd478835d21ff5efb8bb7245fdc4d1274e464155d630e97025248887b157830206f3a15f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -206,9 +213,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3607f8d64e4004cfbe68854885533f255b22dfcf680224744690264eb1185608",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd8d4448a3aff1f0464ecf67ab538496915be4dadc4a52b9c8c5ddcd6013342a4",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -287,10 +301,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_d0g0v0_Frontier" : {
+    "delegatecallInInitcodeToExistingContract_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -301,19 +315,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0xcfb534ca693421167f73f23d71075e550837406fc71c683d15b28ff6196f1ecf",
-                    "mixHash" : "0xccc682ee987b8c7e064d9c6d99afa570c1b7708f75824a61be9971c42d0ffa31",
-                    "nonce" : "0xac8632ae509f1441",
+                    "gasUsed" : "0x020a90",
+                    "hash" : "0x7395fb1b9e81192a1653be92d03aa74acc142d4d76ebc579ae267de7a3e78c9c",
+                    "mixHash" : "0x3c4d1739ddffe3a834bae8b91d8653e7bef827aa9e0c27c38452c8e7006528d5",
+                    "nonce" : "0xe29abe06a4254bb0",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
-                    "stateRoot" : "0x834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1",
+                    "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
+                    "stateRoot" : "0xaa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0ccc682ee987b8c7e064d9c6d99afa570c1b7708f75824a61be9971c42d0ffa3188ac8632ae509f1441f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a03c4d1739ddffe3a834bae8b91d8653e7bef827aa9e0c27c38452c8e7006528d588e29abe06a4254bb0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -350,11 +364,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcfb534ca693421167f73f23d71075e550837406fc71c683d15b28ff6196f1ecf",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7395fb1b9e81192a1653be92d03aa74acc142d4d76ebc579ae267de7a3e78c9c",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
+                "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
@@ -367,8 +381,19 @@
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x1000000000000000000000000000000000000000",
+                    "0x02" : "0x01",
+                    "0x0b" : "0x1000000000000000000000000000000000000000"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
+                "balance" : "0x4563918244f60a90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -382,7 +407,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
+                "balance" : "0x2386f26fbef570",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -420,10 +445,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
+    "delegatecallInInitcodeToExistingContract_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,19 +459,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0207fc",
-                    "hash" : "0x2227fc7dfca0570913be3a1d754070d5e8245c213cb2dd3771cca5dd52909545",
-                    "mixHash" : "0x18baa5f4adbfbce23305659d2704ca3e20ca5a4fc004d9e3bea9db4f042f0847",
-                    "nonce" : "0xc9511283ad50c8ec",
+                    "gasUsed" : "0x020a90",
+                    "hash" : "0xc24f7e8d6ec74df4e2276a051898fdb5be644c9a4c6aa2a3e56926c32a87b471",
+                    "mixHash" : "0xb2603c3a46dc167182cb399bfc27c50eb84511969962f81441f18757fe87973f",
+                    "nonce" : "0xff8d9f909b8b1c10",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
-                    "stateRoot" : "0xb3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792b",
+                    "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
+                    "stateRoot" : "0x4dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a018baa5f4adbfbce23305659d2704ca3e20ca5a4fc004d9e3bea9db4f042f084788c9511283ad50c8ecf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0b2603c3a46dc167182cb399bfc27c50eb84511969962f81441f18757fe87973f88ff8d9f909b8b1c10f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -483,8 +508,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2227fc7dfca0570913be3a1d754070d5e8245c213cb2dd3771cca5dd52909545",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc24f7e8d6ec74df4e2276a051898fdb5be644c9a4c6aa2a3e56926c32a87b471",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -503,7 +528,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x1000000000000000000000000000000000000000",
@@ -512,7 +537,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f607fc",
+                "balance" : "0x4563918244f60a90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -526,7 +551,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbef804",
+                "balance" : "0x2386f26fbef570",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -564,10 +589,10 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_d0g0v0_Metropolis" : {
+    "delegatecallInInitcodeToExistingContract_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -578,19 +603,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x020a90",
-                    "hash" : "0x7ed128038fc8a4a07a557761d6808bd70a9cd63d06dbc092672db80b28b86700",
-                    "mixHash" : "0xcf26f1e4d49c99f85733fe4c15e1e141a2accbc9a7637fb4484dc3b415f6dad8",
-                    "nonce" : "0xa757edcd13799268",
+                    "gasUsed" : "0x06e9d9",
+                    "hash" : "0x4adb13886dd178b3e1a59ea82812376f2be3fdf5ff71e82ae9a8eb8737296d47",
+                    "mixHash" : "0xf45900f971fb96780205c0d224d066e06051976faf48c35f7828c2c4f83ac145",
+                    "nonce" : "0xddf2e204d68b9a0d",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
-                    "stateRoot" : "0xf284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ad",
+                    "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
+                    "stateRoot" : "0x834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f284bd45516b012c00f8de7c26ca961e12bc92047ce251baf6389ac5f79330ada074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0cf26f1e4d49c99f85733fe4c15e1e141a2accbc9a7637fb4484dc3b415f6dad888a757edcd13799268f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0f45900f971fb96780205c0d224d066e06051976faf48c35f7828c2c4f83ac14588ddf2e204d68b9a0df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -627,16 +652,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ed128038fc8a4a07a557761d6808bd70a9cd63d06dbc092672db80b28b86700",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4adb13886dd178b3e1a59ea82812376f2be3fdf5ff71e82ae9a8eb8737296d47",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fae9d9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "0x00",
+                "code" : "0x600160025533600b55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fba1627",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x03e8",
+                "code" : "0x6460016000556000526005601b6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x00",
+                "code" : "0x600160025533600b55",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0207fc",
+                    "hash" : "0xfdee4ae9502a71ff73dd7c56801605a09ed87817bd4bc8c067a889b984965f79",
+                    "mixHash" : "0x891269ab23a9388ff8b6885a5fa7f103740467ae5b192e36df50136ed052101c",
+                    "nonce" : "0xd6f08cf1110c8e15",
+                    "number" : "0x01",
+                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+                    "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
+                    "stateRoot" : "0xb3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0891269ab23a9388ff8b6885a5fa7f103740467ae5b192e36df50136ed052101c88d6f08cf1110c8e15f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfdee4ae9502a71ff73dd7c56801605a09ed87817bd4bc8c067a889b984965f79",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -654,7 +805,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x01",
                     "0x01" : "0x1000000000000000000000000000000000000000",
@@ -663,7 +814,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f60a90",
+                "balance" : "0x4563918244f607fc",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -677,7 +828,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbef570",
+                "balance" : "0x2386f26fbef804",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
index f56854888..01fda40fb 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallOOGinCall_d0g0v0_EIP150" : {
+    "delegatecallOOGinCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x2c7b1f66832979a394263138b1de8008b0a65f428305262d50123f75924811a3",
-                    "mixHash" : "0x8309e215924d61cf1bdee0c3af85089a6b3335c5d55efab336fb1cdd0eebcc18",
-                    "nonce" : "0x5988692ae135754e",
+                    "hash" : "0x83b6df4cc2820a39acfd8df81e2dd35ba0c3fa0774261ef2fc808a74a1ff6754",
+                    "mixHash" : "0xe8d4cb6f9e75e22897343998ae4d9a8ee4e332ed3faa64022962dc39a034981a",
+                    "nonce" : "0xc5627cd8aab12102",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
+                    "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
+                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a08309e215924d61cf1bdee0c3af85089a6b3335c5d55efab336fb1cdd0eebcc18885988692ae135754ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0e8d4cb6f9e75e22897343998ae4d9a8ee4e332ed3faa64022962dc39a034981a88c5627cd8aab12102f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c7b1f66832979a394263138b1de8008b0a65f428305262d50123f75924811a3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x83b6df4cc2820a39acfd8df81e2dd35ba0c3fa0774261ef2fc808a74a1ff6754",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "delegatecallOOGinCall_d0g0v0_EIP158" : {
+    "delegatecallOOGinCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x1f2af933161c593f0f4263c3f7544d07fb98638b1c955ee367a3f05179236105",
-                    "mixHash" : "0x15636f74b60c7bfb0703a9370e79ceb4aea415d09c43e048a0f0656e599ef51e",
-                    "nonce" : "0x403ac567eda9f214",
+                    "hash" : "0x424732bf6be0409189d93c0f87d71ef6db43db82bcd2f7f7e05fb2c6fc2e70ff",
+                    "mixHash" : "0xbeafebb7db18c8d990170e98a504f995fdce0aafc19358c6bab38c23b2b945d2",
+                    "nonce" : "0x29b965ab51fac17c",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
+                    "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
+                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a015636f74b60c7bfb0703a9370e79ceb4aea415d09c43e048a0f0656e599ef51e88403ac567eda9f214f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0beafebb7db18c8d990170e98a504f995fdce0aafc19358c6bab38c23b2b945d28829b965ab51fac17cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f2af933161c593f0f4263c3f7544d07fb98638b1c955ee367a3f05179236105",
-        "network" : "EIP158",
+        "lastblockhash" : "0x424732bf6be0409189d93c0f87d71ef6db43db82bcd2f7f7e05fb2c6fc2e70ff",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "delegatecallOOGinCall_d0g0v0_Frontier" : {
+    "delegatecallOOGinCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x5979e4217bc57eab5aeb857e558d109733dffd6f9a09869c91f37833983afddd",
-                    "mixHash" : "0x8b2dd1f3a69e8869f1b60a5066ef4fb2fed2df4c3e3500c8c8f1a3acb569b038",
-                    "nonce" : "0x6e41aa0964641ad7",
+                    "gasUsed" : "0xca0f",
+                    "hash" : "0x7e409616a0b1f9c4bd9b6047521f610cae15b15ae791cde65f5585bc5435a3ec",
+                    "mixHash" : "0x170c338e9dbf69e28f42f91d7167d0576670c1ed2804a47047be517b9037f936",
+                    "nonce" : "0xb79c63b22bc1bc33",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
-                    "stateRoot" : "0x8865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815",
+                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
+                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08b2dd1f3a69e8869f1b60a5066ef4fb2fed2df4c3e3500c8c8f1a3acb569b038886e41aa0964641ad7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0170c338e9dbf69e28f42f91d7167d0576670c1ed2804a47047be517b9037f93688b79c63b22bc1bc33f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,18 +316,19 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5979e4217bc57eab5aeb857e558d109733dffd6f9a09869c91f37833983afddd",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7e409616a0b1f9c4bd9b6047521f610cae15b15ae791cde65f5585bc5435a3ec",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4ca0f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -327,7 +342,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a76335f1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -358,10 +373,10 @@
             }
         }
     },
-    "delegatecallOOGinCall_d0g0v0_Homestead" : {
+    "delegatecallOOGinCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -372,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xc77b",
-                    "hash" : "0x2e0022a8df719b46beb69cf3582c9af25f43b703337296bb062f02d6b3ac1fa3",
-                    "mixHash" : "0x7c836441ebbea02b8791783b41627d2b5f8d4cca53fe6c8e9f2953a3770d56ef",
-                    "nonce" : "0x9a62a4e85d389115",
+                    "gasUsed" : "0xca0f",
+                    "hash" : "0xc660cee410a977e4218a8e3bf20ed25d33e8f0537557d5e700becaa45c47bca4",
+                    "mixHash" : "0xef3f2694f509a766aeb6f0749c4a37f565d8f758b05467edd908a16e9ec4c7d8",
+                    "nonce" : "0x03125f213dece9bd",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
-                    "stateRoot" : "0xba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3eba",
+                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
+                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a07c836441ebbea02b8791783b41627d2b5f8d4cca53fe6c8e9f2953a3770d56ef889a62a4e85d389115f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0ef3f2694f509a766aeb6f0749c4a37f565d8f758b05467edd908a16e9ec4c7d88803125f213dece9bdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -421,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e0022a8df719b46beb69cf3582c9af25f43b703337296bb062f02d6b3ac1fa3",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc660cee410a977e4218a8e3bf20ed25d33e8f0537557d5e700becaa45c47bca4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -433,7 +448,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4c77b",
+                "balance" : "0x4563918244f4ca0f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -447,7 +462,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7633885",
+                "balance" : "0x0de0b6b3a76335f1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -478,10 +493,10 @@
             }
         }
     },
-    "delegatecallOOGinCall_d0g0v0_Metropolis" : {
+    "delegatecallOOGinCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -492,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xca0f",
-                    "hash" : "0xcbe59c98ff47140acaa0d8331a2f9e770dfd907c53d0f831bcfdbf61651fa920",
-                    "mixHash" : "0xf5404320dcd76e1d8ea0e189efbae41d10386fe8b16000b5f33ccf7525735612",
-                    "nonce" : "0x03e0392d7f9cee40",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0x57ece175a64cdb7f4f44e5a7e4fcea147cfdf5cd50dbf5d89cb1c3005c7ddd41",
+                    "mixHash" : "0xcdd7deb4ef570700b998aa88d36ad1844df037f3e15988b7717cd52080ee9670",
+                    "nonce" : "0x1c57579e44f9be4c",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
-                    "stateRoot" : "0xec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8b",
+                    "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
+                    "stateRoot" : "0x8865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec689f4e73fad8c42d9cd19544b8aeda3e9df2d9318ec079095c2e7db76dcf8ba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0f5404320dcd76e1d8ea0e189efbae41d10386fe8b16000b5f33ccf75257356128803e0392d7f9cee40f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0cdd7deb4ef570700b998aa88d36ad1844df037f3e15988b7717cd52080ee9670881c57579e44f9be4cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -541,16 +556,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcbe59c98ff47140acaa0d8331a2f9e770dfd907c53d0f831bcfdbf61651fa920",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x57ece175a64cdb7f4f44e5a7e4fcea147cfdf5cd50dbf5d89cb1c3005c7ddd41",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824521c6c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7363940",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x6001600155603760005360026000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallOOGinCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xc77b",
+                    "hash" : "0xac8144e4a8b03f30d7861f9388ab11fab103ce502b50ecc414b2be74ad020a8d",
+                    "mixHash" : "0x2e71cb0c715ac5ebcd869e4dea5d55ad0d6dfb3cfb3f35aa190032d90829cc84",
+                    "nonce" : "0x68654a8ced1fcc8e",
+                    "number" : "0x01",
+                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+                    "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
+                    "stateRoot" : "0xba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3eba",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a02e71cb0c715ac5ebcd869e4dea5d55ad0d6dfb3cfb3f35aa190032d90829cc848868654a8ced1fcc8ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xac8144e4a8b03f30d7861f9388ab11fab103ce502b50ecc414b2be74ad020a8d",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
@@ -560,7 +687,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0f",
+                "balance" : "0x4563918244f4c77b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -574,7 +701,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76335f1",
+                "balance" : "0x0de0b6b3a7633885",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
index 70b1514f7..f36f6c162 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallSenderCheck_d0g0v0_EIP150" : {
+    "delegatecallSenderCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x44f29ea891adcc64046aa497e052c5dda36b70bf5c6f3c40b8f8999c7064d6b5",
-                    "mixHash" : "0xb559bc69660b57c852c436509049d5f5dc0d0ed48df6ce33d747494205de1911",
-                    "nonce" : "0x055ef8f55517fff4",
+                    "hash" : "0xc29a9ba79b2e795a8706350f6ae8943a42274d982486ba5988243192bce5cf8f",
+                    "mixHash" : "0x370f3d6021bae164320f2014233918f689312a7e389a1a93b66b9d9ba32a8f96",
+                    "nonce" : "0xc88161deea8b4d65",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0b559bc69660b57c852c436509049d5f5dc0d0ed48df6ce33d747494205de191188055ef8f55517fff4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0370f3d6021bae164320f2014233918f689312a7e389a1a93b66b9d9ba32a8f9688c88161deea8b4d65f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44f29ea891adcc64046aa497e052c5dda36b70bf5c6f3c40b8f8999c7064d6b5",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc29a9ba79b2e795a8706350f6ae8943a42274d982486ba5988243192bce5cf8f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "delegatecallSenderCheck_d0g0v0_EIP158" : {
+    "delegatecallSenderCheck_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xb776cd2825437a6e5462849a4bd39e9eb3e8502f01e41d3a44c37399b8d23eb8",
-                    "mixHash" : "0x6966c718dceb0f59aa90e139cbb4a91eb5267ba0ee9d72a9b43cfe5551012f8b",
-                    "nonce" : "0xd12faf15692a64e8",
+                    "hash" : "0x392314e7274c40a6e2e6725c0b3f87626b3e1c181dcb6b94464d7721f5ea8092",
+                    "mixHash" : "0xc0a503bb0ef44abc8547ba2b5f34705e0c93d638e25a41983289eb125372de1e",
+                    "nonce" : "0x7961806eef4cb65a",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a06966c718dceb0f59aa90e139cbb4a91eb5267ba0ee9d72a9b43cfe5551012f8b88d12faf15692a64e8f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0c0a503bb0ef44abc8547ba2b5f34705e0c93d638e25a41983289eb125372de1e887961806eef4cb65af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb776cd2825437a6e5462849a4bd39e9eb3e8502f01e41d3a44c37399b8d23eb8",
-        "network" : "EIP158",
+        "lastblockhash" : "0x392314e7274c40a6e2e6725c0b3f87626b3e1c181dcb6b94464d7721f5ea8092",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "delegatecallSenderCheck_d0g0v0_Frontier" : {
+    "delegatecallSenderCheck_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xcc77d7a8fe8e7297ff77de77e274d3f59a142447d8edc7e89d2367e7d7a28e45",
-                    "mixHash" : "0x352d1ca9c9615aa6629a6ab209d707ce61257893325eae0510e1b80b783e32c1",
-                    "nonce" : "0xdc3e8da494ee2e2a",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0xf78cf276c5226443dd397d3a014ac919f9264f153a6186d77e533900d4649774",
+                    "mixHash" : "0x01903714636c09fa56bc2d35974c375fbcf2e5a14b64c2877f0a63b51a6f8ab6",
+                    "nonce" : "0x9c1fdc2b5bc67150",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
-                    "stateRoot" : "0x2f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66",
+                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
+                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0352d1ca9c9615aa6629a6ab209d707ce61257893325eae0510e1b80b783e32c188dc3e8da494ee2e2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a001903714636c09fa56bc2d35974c375fbcf2e5a14b64c2877f0a63b51a6f8ab6889c1fdc2b5bc67150f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +318,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc77d7a8fe8e7297ff77de77e274d3f59a142447d8edc7e89d2367e7d7a28e45",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf78cf276c5226443dd397d3a014ac919f9264f153a6186d77e533900d4649774",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +345,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7630edc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +376,10 @@
             }
         }
     },
-    "delegatecallSenderCheck_d0g0v0_Homestead" : {
+    "delegatecallSenderCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xee90",
-                    "hash" : "0x8a53974831375d37b5a9f3d3ae85ba41150c5039e972cda63f592912723a9e7e",
-                    "mixHash" : "0xcec4a212a0e080b14f8fd01ff87137625d5908772e5af0a1d58c5c0486d4082d",
-                    "nonce" : "0x84583fa09eb7ca4e",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0x9a9ae583ed48797d4798adeffd374d87fd4140f664dc2e3201fd34d573112eba",
+                    "mixHash" : "0xc26915da40f3babe221904bcdebbb0ffc8bd4856393dbedaf71e5bcfdc3af2e1",
+                    "nonce" : "0xdce3cd18a3ef4917",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
-                    "stateRoot" : "0x1dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795",
+                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
+                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0cec4a212a0e080b14f8fd01ff87137625d5908772e5af0a1d58c5c0486d4082d8884583fa09eb7ca4ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0c26915da40f3babe221904bcdebbb0ffc8bd4856393dbedaf71e5bcfdc3af2e188dce3cd18a3ef4917f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a53974831375d37b5a9f3d3ae85ba41150c5039e972cda63f592912723a9e7e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9a9ae583ed48797d4798adeffd374d87fd4140f664dc2e3201fd34d573112eba",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -436,7 +452,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ee90",
+                "balance" : "0x4563918244f4f124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -450,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631170",
+                "balance" : "0x0de0b6b3a7630edc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -481,10 +497,10 @@
             }
         }
     },
-    "delegatecallSenderCheck_d0g0v0_Metropolis" : {
+    "delegatecallSenderCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0x67d67041d7f2654d4bef4abb215e95da1b103aa6d4c9131e0d4e37988c400a70",
-                    "mixHash" : "0xf3db3a8bc0729f11ddbb83c7237ff73eb89e38372dbc927ca5c0ea6325f22a45",
-                    "nonce" : "0x7a3f61bff8bb911d",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0x642d02c65e49de79a0786ce4bb0da942ce868663447c8c4938df9fd6e385a710",
+                    "mixHash" : "0xccbb9b2a25523b050e5d15f315558bba39d6ad6643b36e2b47abc69575220499",
+                    "nonce" : "0xdbda85af97bc7f8b",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x2c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471",
+                    "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
+                    "stateRoot" : "0x2f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02c9597a4854efde7d01d64b2943208760e25c30f4b8a304ee9f4ee00e36c6471a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0f3db3a8bc0729f11ddbb83c7237ff73eb89e38372dbc927ca5c0ea6325f22a45887a3f61bff8bb911df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ccbb9b2a25523b050e5d15f315558bba39d6ad6643b36e2b47abc6957522049988dbda85af97bc7f8bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +560,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67d67041d7f2654d4bef4abb215e95da1b103aa6d4c9131e0d4e37988c400a70",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x642d02c65e49de79a0786ce4bb0da942ce868663447c8c4938df9fd6e385a710",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824521c6c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x33600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x33600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallSenderCheck_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xee90",
+                    "hash" : "0x2c6b084d22814564729bbabe5ed89f1e51d92d9a5d46bd635d3af086f5bb120c",
+                    "mixHash" : "0x414a8a62ff87f282c97707fc64ddbdc4dc10f51186d17ff7ac2955357175dea0",
+                    "nonce" : "0x2ce139ab67a8e9ad",
+                    "number" : "0x01",
+                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+                    "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
+                    "stateRoot" : "0x1dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0414a8a62ff87f282c97707fc64ddbdc4dc10f51186d17ff7ac2955357175dea0882ce139ab67a8e9adf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
+                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2c6b084d22814564729bbabe5ed89f1e51d92d9a5d46bd635d3af086f5bb120c",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -564,7 +692,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x4563918244f4ee90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -578,7 +706,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630edc",
+                "balance" : "0x0de0b6b3a7631170",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
index dc83eaf65..02d9a373a 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecallValueCheck_d0g0v0_EIP150" : {
+    "delegatecallValueCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xc731c6403246dd252b8a54e24a63899d78c554c70bd64a7058d19f734b700c23",
-                    "mixHash" : "0x5ee2a546a753c6b1cda3bd18bc97c04d1aedd2e5f9cceda0cabe2e6f58ac3fa4",
-                    "nonce" : "0x80d7b86520375efa",
+                    "hash" : "0x35faa191d2f331e3696ddc5fdff8036d06758e05583ecabd67ee28575f8c2a5a",
+                    "mixHash" : "0x7e8dbb8bdc36b950302db17134b90424ba5715b84b96a0057594c9ca2cc3f8ed",
+                    "nonce" : "0x8dfda266e6a8049f",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05ee2a546a753c6b1cda3bd18bc97c04d1aedd2e5f9cceda0cabe2e6f58ac3fa48880d7b86520375efaf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a07e8dbb8bdc36b950302db17134b90424ba5715b84b96a0057594c9ca2cc3f8ed888dfda266e6a8049ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc731c6403246dd252b8a54e24a63899d78c554c70bd64a7058d19f734b700c23",
-        "network" : "EIP150",
+        "lastblockhash" : "0x35faa191d2f331e3696ddc5fdff8036d06758e05583ecabd67ee28575f8c2a5a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -120,10 +127,10 @@
             }
         }
     },
-    "delegatecallValueCheck_d0g0v0_EIP158" : {
+    "delegatecallValueCheck_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0x2432fa26b78c9798b4c1c04cb3a9bbdaaaf0cd9939cbad4d7dde9f49939c740b",
-                    "mixHash" : "0x16aa40810955ee125e6c529f40ee86e3146d2b74a450eedef82bbdf3d28a363e",
-                    "nonce" : "0xda4eca5744e30adc",
+                    "hash" : "0x27ebb2c32a4c868da2795df67c34455cf684577e8eadc49afc686d656a4f52ac",
+                    "mixHash" : "0xbe95f407391b05003c9310375305376f45c527bbe558a374bd6214c262fa1ca7",
+                    "nonce" : "0x2b92b4a8673fa965",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
+                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
+                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a016aa40810955ee125e6c529f40ee86e3146d2b74a450eedef82bbdf3d28a363e88da4eca5744e30adcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0be95f407391b05003c9310375305376f45c527bbe558a374bd6214c262fa1ca7882b92b4a8673fa965f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -183,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2432fa26b78c9798b4c1c04cb3a9bbdaaaf0cd9939cbad4d7dde9f49939c740b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x27ebb2c32a4c868da2795df67c34455cf684577e8eadc49afc686d656a4f52ac",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -241,10 +255,10 @@
             }
         }
     },
-    "delegatecallValueCheck_d0g0v0_Frontier" : {
+    "delegatecallValueCheck_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x43898f1353989270125e989eae572e43fa371f3f661d9e87ecf5dee3f48634e8",
-                    "mixHash" : "0xfd5dbda6c0f5be5a9a2611614dabd2959aa742bdc9d62ea19e05692a68634b88",
-                    "nonce" : "0x99c89d9b3ab8d0f0",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0xd85cf3fb7917213cd665f22cbb9fae697566c6c1c66415ea7f5039bf20c4779a",
+                    "mixHash" : "0x0db5b4b29fe92b47139670acf257501a677267f114f3168c5fc1381225c7834a",
+                    "nonce" : "0x460745b660d2dd03",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
-                    "stateRoot" : "0x41a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004c",
+                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
+                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fd5dbda6c0f5be5a9a2611614dabd2959aa742bdc9d62ea19e05692a68634b888899c89d9b3ab8d0f0f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a00db5b4b29fe92b47139670acf257501a677267f114f3168c5fc1381225c7834a88460745b660d2dd03f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -304,18 +318,20 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43898f1353989270125e989eae572e43fa371f3f661d9e87ecf5dee3f48634e8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd85cf3fb7917213cd665f22cbb9fae697566c6c1c66415ea7f5039bf20c4779a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x17"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
+                "balance" : "0x4563918244f4f124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -329,7 +345,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
+                "balance" : "0x0de0b6b3a7630ec5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -360,10 +376,10 @@
             }
         }
     },
-    "delegatecallValueCheck_d0g0v0_Homestead" : {
+    "delegatecallValueCheck_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xee90",
-                    "hash" : "0xb667104569316130c73a7fd518d246245acfce3c16c56f5f8a8791fe3ef73a06",
-                    "mixHash" : "0x9c16db77e955cccb737112488f4efa7a6273058739eda8240df991858d0639d0",
-                    "nonce" : "0x51a9a66a44204c83",
+                    "gasUsed" : "0xf124",
+                    "hash" : "0xb0bf93d72ed4446d9704cbdf54a5d8998b82b9d005b1aaf5e29d79fafe6b4467",
+                    "mixHash" : "0xcebccf07d71360317c0b274b4a33b0133b86f666ffdad5e58daba97f2995de34",
+                    "nonce" : "0xb19d6ed07a4371fd",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
-                    "stateRoot" : "0x84853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8",
+                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
+                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a09c16db77e955cccb737112488f4efa7a6273058739eda8240df991858d0639d08851a9a66a44204c83f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0cebccf07d71360317c0b274b4a33b0133b86f666ffdad5e58daba97f2995de3488b19d6ed07a4371fdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -423,8 +439,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb667104569316130c73a7fd518d246245acfce3c16c56f5f8a8791fe3ef73a06",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb0bf93d72ed4446d9704cbdf54a5d8998b82b9d005b1aaf5e29d79fafe6b4467",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
@@ -436,7 +452,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ee90",
+                "balance" : "0x4563918244f4f124",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -450,7 +466,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7631159",
+                "balance" : "0x0de0b6b3a7630ec5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -481,10 +497,10 @@
             }
         }
     },
-    "delegatecallValueCheck_d0g0v0_Metropolis" : {
+    "delegatecallValueCheck_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +511,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0xe93457470ff0bc358a4811bee8e31223581c937b86737f3e6855ff523e54dc7e",
-                    "mixHash" : "0x4ff9d17e35f43bb95cbb09d05b398542b9824cdb657dff7fdbd3b1bf190b1811",
-                    "nonce" : "0x6d3d5d15ffcd47e9",
+                    "gasUsed" : "0x2dc6c0",
+                    "hash" : "0xa145db3a8999cfea53adbde8208e7a77792efdffc6558971129a78247cb7b442",
+                    "mixHash" : "0xce1bb5bdad2140fe492a534901ea32ed583dca98a7395a268b45a601f49adf9b",
+                    "nonce" : "0x920998ac5c7def7f",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
-                    "stateRoot" : "0x44246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0",
+                    "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
+                    "stateRoot" : "0x41a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044246a062bab2860048f619b3c304702e8e31d73e4d4a346e63c68b0657286f0a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a04ff9d17e35f43bb95cbb09d05b398542b9824cdb657dff7fdbd3b1bf190b1811886d3d5d15ffcd47e9f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ce1bb5bdad2140fe492a534901ea32ed583dca98a7395a268b45a601f49adf9b88920998ac5c7def7ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +560,128 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe93457470ff0bc358a4811bee8e31223581c937b86737f3e6855ff523e54dc7e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa145db3a8999cfea53adbde8208e7a77792efdffc6558971129a78247cb7b442",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824521c6c0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x34600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7363940",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "0x17",
+                "code" : "0x34600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecallValueCheck_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xee90",
+                    "hash" : "0xfa32eea9ac80ec7e1d80e15788d1ebd7d7f915df53c110aa2cae88881f8607c9",
+                    "mixHash" : "0xa229f9301520a63e3e6307fbf5cfc9d1ad5b76c84db00a6ef3622436733bfd4d",
+                    "nonce" : "0x0c8f98d81bf6b9e2",
+                    "number" : "0x01",
+                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+                    "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
+                    "stateRoot" : "0x84853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0a229f9301520a63e3e6307fbf5cfc9d1ad5b76c84db00a6ef3622436733bfd4d880c8f98d81bf6b9e2f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
+                        "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x17"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfa32eea9ac80ec7e1d80e15788d1ebd7d7f915df53c110aa2cae88881f8607c9",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640017",
                 "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
@@ -564,7 +692,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
+                "balance" : "0x4563918244f4ee90",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -578,7 +706,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec5",
+                "balance" : "0x0de0b6b3a7631159",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
index 592f1883f..3252a88d6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x9fbc397dbaa2025ee3382758a8bb8f69e939ac0078ad13af3033102172d0432c",
-                    "mixHash" : "0x8273ee695e935fcd8668fec4dad6fe8345b9dc8b678e6ec1f5bd66cba98fb0f5",
-                    "nonce" : "0xfe4654f9f95c3d01",
+                    "hash" : "0x11d349f477a4b3587227d53d94ef54f0cdfd7ee4da55a6d0ca47af7ec27d4c4a",
+                    "mixHash" : "0x1c3ea5c72cb20787f563b8493b542334b9eff4e3ad31c1df9fb9a29b91e0b184",
+                    "nonce" : "0xbd0087ecc82be34f",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
-                    "stateRoot" : "0x21d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145e",
+                    "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
+                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a08273ee695e935fcd8668fec4dad6fe8345b9dc8b678e6ec1f5bd66cba98fb0f588fe4654f9f95c3d01f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a01c3ea5c72cb20787f563b8493b542334b9eff4e3ad31c1df9fb9a29b91e0b18488bd0087ecc82be34ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fbc397dbaa2025ee3382758a8bb8f69e939ac0078ad13af3033102172d0432c",
-        "network" : "EIP150",
+        "lastblockhash" : "0x11d349f477a4b3587227d53d94ef54f0cdfd7ee4da55a6d0ca47af7ec27d4c4a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -75,7 +82,7 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
@@ -113,10 +120,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x76a8b1bb9c0bd487a3df0a3c14a76d8c2518f08e9b180adb7053b972a76c7a7f",
-                    "mixHash" : "0x08e9f28244b2a8f71348c383405e40a8130fcad058179c1be01da3af05a4a0da",
-                    "nonce" : "0xd40a90c8521268f8",
+                    "hash" : "0x5ed0280b7000310695c8c25085611429e7531f0f75582480c4496cc5c8442a69",
+                    "mixHash" : "0x3c491d5f56023203ef8314589d9340850bce9f8b6c48d7982cd90d310c922674",
+                    "nonce" : "0x12d4ffdf23dc1eb7",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
-                    "stateRoot" : "0xcf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81",
+                    "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
+                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a008e9f28244b2a8f71348c383405e40a8130fcad058179c1be01da3af05a4a0da88d40a90c8521268f8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a03c491d5f56023203ef8314589d9340850bce9f8b6c48d7982cd90d310c9226748812d4ffdf23dc1eb7f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76a8b1bb9c0bd487a3df0a3c14a76d8c2518f08e9b180adb7053b972a76c7a7f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5ed0280b7000310695c8c25085611429e7531f0f75582480c4496cc5c8442a69",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0xc98a0efa970ccb428f6aeed09dcb68e9a35a33363d13725b3b294a9789b0caa9",
-                    "mixHash" : "0xcf2399596f4f3cb641a45299615eaf8021a63b57ee3b6e9e9c21dbf5fecc108a",
-                    "nonce" : "0x14fd6caa45ad9430",
+                    "gasUsed" : "0x016e45",
+                    "hash" : "0xf6a3be601d2ea92893e9ae4d1b6cf4ae968d5ffdf300c6076662dcbf65121258",
+                    "mixHash" : "0x6eef8228faeacb1538a4bccfe48cc6fe56da87c6364a5d98fd11e4afcca502c9",
+                    "nonce" : "0x5bd6ddcdf3b19c0a",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
-                    "stateRoot" : "0x17c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084",
+                    "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
+                    "stateRoot" : "0x21d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0cf2399596f4f3cb641a45299615eaf8021a63b57ee3b6e9e9c21dbf5fecc108a8814fd6caa45ad9430f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a06eef8228faeacb1538a4bccfe48cc6fe56da87c6364a5d98fd11e4afcca502c9885bd6ddcdf3b19c0af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,25 +304,34 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc98a0efa970ccb428f6aeed09dcb68e9a35a33363d13725b3b294a9789b0caa9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf6a3be601d2ea92893e9ae4d1b6cf4ae968d5ffdf300c6076662dcbf65121258",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
+                "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0b" : "0x01",
+                    "0x0c" : "0x1000000000000000000000000000000000000000"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
+                "balance" : "0x4563918244f56e45",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
+                "balance" : "0x2386f26fbf91bb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -332,10 +355,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,19 +369,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016bb1",
-                    "hash" : "0xb84bc8bda10506ddcd2da660debf965bf251a0043f2ab0ad7ce5ccc546b6f1bc",
-                    "mixHash" : "0x9672985d541cc3069b39a70f8fcc53de4002031a62a2566b4f80852ff400b4ab",
-                    "nonce" : "0xc09b9cc98a4cec3d",
+                    "gasUsed" : "0x016e45",
+                    "hash" : "0x604f2380b80cb5add4772d81879f45192b74200e4079d9cf5ddfea1dbd367d1d",
+                    "mixHash" : "0x4d22ca815618d704a9fef31071689957f00d1837d4abbb730df5ed3dc8e1c2ed",
+                    "nonce" : "0xcf268a16c417b31b",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
-                    "stateRoot" : "0xa11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0",
+                    "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
+                    "stateRoot" : "0xcf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a09672985d541cc3069b39a70f8fcc53de4002031a62a2566b4f80852ff400b4ab88c09b9cc98a4cec3df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a04d22ca815618d704a9fef31071689957f00d1837d4abbb730df5ed3dc8e1c2ed88cf268a16c417b31bf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -395,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb84bc8bda10506ddcd2da660debf965bf251a0043f2ab0ad7ce5ccc546b6f1bc",
-        "network" : "Homestead",
+        "lastblockhash" : "0x604f2380b80cb5add4772d81879f45192b74200e4079d9cf5ddfea1dbd367d1d",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
@@ -408,21 +431,21 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56bb1",
+                "balance" : "0x4563918244f56e45",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf944f",
+                "balance" : "0x2386f26fbf91bb",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -446,10 +469,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_d0g0v0_Metropolis" : {
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -460,19 +483,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e45",
-                    "hash" : "0x88d517f8272046db5c2848ecd8520c5a5ee76a83dce2fc2e2af20df0192eee02",
-                    "mixHash" : "0xa9ee1765c8ef45e699a27fef1e78000bda8c066b86b86d691988f642f58cfca6",
-                    "nonce" : "0x6e42e7f5ea6dce36",
+                    "gasUsed" : "0x06e9d9",
+                    "hash" : "0x7473e1ed284f386975eaeacc64bfdb9201a78411857e8ccfe1fefe7cd2f9d3f9",
+                    "mixHash" : "0xd72e986442ed29cfe943250b99c80a229ec9b0a0c182c67aeae91a18219f88db",
+                    "nonce" : "0xd75686dc6b8f417c",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
-                    "stateRoot" : "0xe0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679",
+                    "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
+                    "stateRoot" : "0x17c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0201d1157d767e44269dfa6cbe58b48e59ce3e2efa5a49a8286d18787582679a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0a9ee1765c8ef45e699a27fef1e78000bda8c066b86b86d691988f642f58cfca6886e42e7f5ea6dce36f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0d72e986442ed29cfe943250b99c80a229ec9b0a0c182c67aeae91a18219f88db88d75686dc6b8f417cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -509,16 +532,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88d517f8272046db5c2848ecd8520c5a5ee76a83dce2fc2e2af20df0192eee02",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x7473e1ed284f386975eaeacc64bfdb9201a78411857e8ccfe1fefe7cd2f9d3f9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fae9d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fba1627",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x10c8e0",
+                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x016bb1",
+                    "hash" : "0xf1421c81daaeeae6fcb58cdc311a9a9c4268721e1022b2072d11ef2e39c2fdbb",
+                    "mixHash" : "0x4ec345627965db8e7faa73844d37364febfac9b0f8aeb06f36485862518de98c",
+                    "nonce" : "0x5c83e8f1af404637",
+                    "number" : "0x01",
+                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+                    "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
+                    "stateRoot" : "0xa11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a04ec345627965db8e7faa73844d37364febfac9b0f8aeb06f36485862518de98c885c83e8f1af404637f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf1421c81daaeeae6fcb58cdc311a9a9c4268721e1022b2072d11ef2e39c2fdbb",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x10c8df",
                 "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
@@ -529,21 +650,21 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x01",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x01",
                     "0x0c" : "0x1000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e45",
+                "balance" : "0x4563918244f56bb1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91bb",
+                "balance" : "0x2386f26fbf944f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
index d333f0225..e5c19a37d 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "delegatecodeDynamicCode_d0g0v0_EIP150" : {
+    "delegatecodeDynamicCode_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x028ec6",
-                    "hash" : "0x196c62ffd039aafe8ab486bbaca2b339b0362191e989cd7e6886ddc1b2dff962",
-                    "mixHash" : "0x26970fe8e9db6b61b5e0c69ade9fbe093203f6d2785c4df5cef7467d769442ea",
-                    "nonce" : "0x73a52739084e13c5",
+                    "gasUsed" : "0x01f27b",
+                    "hash" : "0x429590fc2f1ea34ad257915975a1a425eec74b4c16b9254ca0980ce5a9f7dff8",
+                    "mixHash" : "0x9620d985cb6d77b42006cf178498a6c3f017f6863f13ca14b16c38496d9b144b",
+                    "nonce" : "0x66c41f73d5fb14c6",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
-                    "stateRoot" : "0x92b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5",
+                    "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
+                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a026970fe8e9db6b61b5e0c69ade9fbe093203f6d2785c4df5cef7467d769442ea8873a52739084e13c5f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a09620d985cb6d77b42006cf178498a6c3f017f6863f13ca14b16c38496d9b144b8866c41f73d5fb14c6f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x196c62ffd039aafe8ab486bbaca2b339b0362191e989cd7e6886ddc1b2dff962",
-        "network" : "EIP150",
+        "lastblockhash" : "0x429590fc2f1ea34ad257915975a1a425eec74b4c16b9254ca0980ce5a9f7dff8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -75,32 +82,30 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x02",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
-                    "0x0b" : "0x01",
-                    "0x14" : "0x1000000000000000000000000000000000000000"
+                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                    "0x0b" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68ec6",
+                "balance" : "0x4563918244f5f27b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbe713a",
-                "code" : "",
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
-                "nonce" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf0d85",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -122,10 +127,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode_d0g0v0_EIP158" : {
+    "delegatecodeDynamicCode_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,18 +142,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0x7d7c2efcff8ee387e91c80ae833e0f2794b914bc7675ebce46a019c717b1e602",
-                    "mixHash" : "0x7aa9ffec8928cd253362cbf2e5d18c2e31be38cd0eb00a3159ecedf089397161",
-                    "nonce" : "0x57080b6792536db9",
+                    "hash" : "0x64579d3f6e252482066fe0929725d673f0066c989ff4a665a917403cd80e1e25",
+                    "mixHash" : "0xbca91ce9cef0a011d68d5cab927c785a71953b7fa2e44b590fe377e304080c59",
+                    "nonce" : "0x67230b4fb6b0ec1d",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
-                    "stateRoot" : "0xec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58",
+                    "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
+                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a07aa9ffec8928cd253362cbf2e5d18c2e31be38cd0eb00a3159ecedf0893971618857080b6792536db9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0bca91ce9cef0a011d68d5cab927c785a71953b7fa2e44b590fe377e304080c598867230b4fb6b0ec1df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -185,9 +190,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d7c2efcff8ee387e91c80ae833e0f2794b914bc7675ebce46a019c717b1e602",
-        "network" : "EIP158",
+        "lastblockhash" : "0x64579d3f6e252482066fe0929725d673f0066c989ff4a665a917403cd80e1e25",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -243,10 +255,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode_d0g0v0_Frontier" : {
+    "delegatecodeDynamicCode_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +269,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x05e4d7262eb86d79f63de2c2502c295aa21de3032c935cbb04615f6d82551614",
-                    "mixHash" : "0xbeedcedde753b2682b4b9adffd3357bbd9f73820b9c1be3c268a307e60c8bd21",
-                    "nonce" : "0x3dc8b871899cc505",
+                    "gasUsed" : "0x028ec6",
+                    "hash" : "0xe0dc962a624e643535c6769adee11566f276dea22d2cb7dce6668c8730704233",
+                    "mixHash" : "0x43080f632be0bd7e88614f1cd02ac69589230942bebde34df866977b7300489e",
+                    "nonce" : "0xacdcb80a085a5ac8",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
-                    "stateRoot" : "0x38a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035",
+                    "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
+                    "stateRoot" : "0x92b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0beedcedde753b2682b4b9adffd3357bbd9f73820b9c1be3c268a307e60c8bd21883dc8b871899cc505f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a043080f632be0bd7e88614f1cd02ac69589230942bebde34df866977b7300489e88acdcb80a085a5ac8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,29 +318,47 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x05e4d7262eb86d79f63de2c2502c295aa21de3032c935cbb04615f6d82551614",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe0dc962a624e643535c6769adee11566f276dea22d2cb7dce6668c8730704233",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
+                "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
+            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
+                    "0x0b" : "0x01",
+                    "0x14" : "0x1000000000000000000000000000000000000000"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
+                "balance" : "0x4563918244f68ec6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
+                "balance" : "0x2386f26fbe713a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -348,10 +378,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode_d0g0v0_Homestead" : {
+    "delegatecodeDynamicCode_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -362,19 +392,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x028c32",
-                    "hash" : "0x185469c67559ebc77f653328b002ab8a7f07c8dda5a76c8387baff4ecbc9ac05",
-                    "mixHash" : "0x4a2efa6a439dd03eebbf9edbcbcc89476884e1d5fa6c44f5fd316d0f27e2eeb0",
-                    "nonce" : "0x765247740347a5e2",
+                    "gasUsed" : "0x01f27b",
+                    "hash" : "0x92b4cd8376d86f643b8dbf457781ec39d18c74f917fb444b6c9bc0fd9f72a4f6",
+                    "mixHash" : "0x58041d76bf3a577fde060e0ad84f339a799e147b9b9cca21b6255ad23120880d",
+                    "nonce" : "0xf3e1b7c75531a763",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
-                    "stateRoot" : "0x2d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76",
+                    "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
+                    "stateRoot" : "0xec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a04a2efa6a439dd03eebbf9edbcbcc89476884e1d5fa6c44f5fd316d0f27e2eeb088765247740347a5e2f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a058041d76bf3a577fde060e0ad84f339a799e147b9b9cca21b6255ad23120880d88f3e1b7c75531a763f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -411,8 +441,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x185469c67559ebc77f653328b002ab8a7f07c8dda5a76c8387baff4ecbc9ac05",
-        "network" : "Homestead",
+        "lastblockhash" : "0x92b4cd8376d86f643b8dbf457781ec39d18c74f917fb444b6c9bc0fd9f72a4f6",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
@@ -424,32 +454,30 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x02",
                 "storage" : {
-                    "0x00" : "0x01",
-                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
-                    "0x0b" : "0x01",
-                    "0x14" : "0x1000000000000000000000000000000000000000"
+                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
+                    "0x0b" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f68c32",
+                "balance" : "0x4563918244f5f27b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbe73ce",
-                "code" : "",
+            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
-                "nonce" : "0x00",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbf0d85",
+                "code" : "",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -471,10 +499,10 @@
             }
         }
     },
-    "delegatecodeDynamicCode_d0g0v0_Metropolis" : {
+    "delegatecodeDynamicCode_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -485,19 +513,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01f27b",
-                    "hash" : "0x3ec1fb695fbc531ba4c50761b7353a7a0cade57704c083b0ee8223fcf96766c8",
-                    "mixHash" : "0xef0de38f12b9f9722f1e59d091cacad0a4e409a59517561fb8282e4dc01d585c",
-                    "nonce" : "0x4e35ff0381eeb004",
+                    "gasUsed" : "0x06e9d9",
+                    "hash" : "0xb71b7c1505f83d1fbc87d3b8d36153bc066844997adba1bb0416ad20e72f9c73",
+                    "mixHash" : "0x2b6063ae8186cbc330093c08141f135c5e95fbf2c1bbc85fe09f7922b71d740c",
+                    "nonce" : "0x7e86c63271644298",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
-                    "stateRoot" : "0x82d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9e",
+                    "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
+                    "stateRoot" : "0x38a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082d1ffed4ed05a3c2343b6911fba997efdd2326667698f43a07bfad5b37e5e9ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0ef0de38f12b9f9722f1e59d091cacad0a4e409a59517561fb8282e4dc01d585c884e35ff0381eeb004f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02b6063ae8186cbc330093c08141f135c5e95fbf2c1bbc85fe09f7922b71d740c887e86c63271644298f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -534,16 +562,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ec1fb695fbc531ba4c50761b7353a7a0cade57704c083b0ee8223fcf96766c8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb71b7c1505f83d1fbc87d3b8d36153bc066844997adba1bb0416ad20e72f9c73",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244fae9d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fba1627",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x2710",
+                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fc10000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "delegatecodeDynamicCode_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x028c32",
+                    "hash" : "0xbb0af3d44a4eab278339094f1ddf7ec34356b800fa0d19052614c0438efb3907",
+                    "mixHash" : "0xfdf2c64521d2ce614fc84bd6492db998b453ab2a89cf82119fcbbc131ed89b0e",
+                    "nonce" : "0x5608c923d4e35d07",
+                    "number" : "0x01",
+                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+                    "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
+                    "stateRoot" : "0x2d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a0fdf2c64521d2ce614fc84bd6492db998b453ab2a89cf82119fcbbc131ed89b0e885608c923d4e35d07f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x06e9d9",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
+                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbb0af3d44a4eab278339094f1ddf7ec34356b800fa0d19052614c0438efb3907",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x270f",
                 "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
@@ -554,30 +680,32 @@
             "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x02",
+                "nonce" : "0x01",
                 "storage" : {
-                    "0x0a" : "0x568a95f77b047bece6aa68843d2019332c46a585",
-                    "0x0b" : "0x01"
+                    "0x00" : "0x01",
+                    "0x0a" : "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6",
+                    "0x0b" : "0x01",
+                    "0x14" : "0x1000000000000000000000000000000000000000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f27b",
+                "balance" : "0x4563918244f68c32",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x568a95f77b047bece6aa68843d2019332c46a585" : {
-                "balance" : "0x01",
-                "code" : "0x600160005533601455",
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2386f26fbe73ce",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf0d85",
-                "code" : "",
-                "nonce" : "0x01",
+            "0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6" : {
+                "balance" : "0x01",
+                "code" : "0x600160005533601455",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }